Index: ChangeLog-2.0.0-2.1.0.log
===================================================================
diff -u -rc64854ee2f2a11f2fcf181031efd8306d1973d53 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- ChangeLog-2.0.0-2.1.0.log	(.../ChangeLog-2.0.0-2.1.0.log)	(revision c64854ee2f2a11f2fcf181031efd8306d1973d53)
+++ ChangeLog-2.0.0-2.1.0.log	(.../ChangeLog-2.0.0-2.1.0.log)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -706,9 +706,9 @@
 	same interface as slot-setters. When new flag -trace is set, a
 	trace will be registered calling either:
 
-	value=get /obj/ /variableName/ or
-	value=set /obj/ /variableName/ /value/ or
-	value value=default /obj/ /variable/ on the slot.
+	value=get /obj/ /variableName/; or
+	value=set /obj/ /variableName/ /value/; or
+	value=default /obj/ /variable/; on the slot.
 
 	Updated regression test accordingly. [dadf28e]
 
@@ -761,8 +761,6 @@
 
 2015-12-30  Gustaf Neumann  <neumann@wu-wien.ac.at>
 
-
-	-
 	- generalize method serialization of forwarders [8cbd921]
 
 2015-12-29  Gustaf Neumann  <neumann@wu-wien.ac.at>
Index: Makefile.in
===================================================================
diff -u -rc7738a386075dae91fb88e6a93232f37dfedc228 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- Makefile.in	(.../Makefile.in)	(revision c7738a386075dae91fb88e6a93232f37dfedc228)
+++ Makefile.in	(.../Makefile.in)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -9,7 +9,8 @@
 # Copyright (c) 1999 Scriptics Corporation.
 # Copyright (c) 2002-2003 ActiveState Corporation.
 # Copyright (c) 2001-2007 Uwe Zdun
-# Copyright (c) 2001-2014 Gustaf Neumann
+# Copyright (c) 2001-2016 Gustaf Neumann
+# Copyright (c) 2016 Stefan Sobernig
 #
 # See the file "tcl-license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
Index: doc/Announce2.1.0
===================================================================
diff -u -rc64854ee2f2a11f2fcf181031efd8306d1973d53 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- doc/Announce2.1.0	(.../Announce2.1.0)	(revision c64854ee2f2a11f2fcf181031efd8306d1973d53)
+++ doc/Announce2.1.0	(.../Announce2.1.0)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -128,6 +128,8 @@
 
     Features removed: none
 
+    (TODO: what about old trace interface: valuechangedcmd & friends?)
+
     Changes to existing features: none 
 
     NSF:
Index: doc/Class.man
===================================================================
diff -u -r0228cdf0ec65ab129536c20196a05d593ceb59b4 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- doc/Class.man	(.../Class.man)	(revision 0228cdf0ec65ab129536c20196a05d593ceb59b4)
+++ doc/Class.man	(.../Class.man)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -23,7 +23,7 @@
 [vset CMD "cls"]
 [vset MODIFIER ""]
 
-[copyright {2014 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>; available under the Creative Commons Attribution 3.0 Austria license (CC BY 3.0 AT).}]
+[copyright {2014-2016 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>; available under the Creative Commons Attribution 3.0 Austria license (CC BY 3.0 AT).}]
 [titledesc {API reference of the base-metaclass of the NX objectsystem}]
 [moddesc {NX API}]
 
Index: doc/configure.man
===================================================================
diff -u -r0228cdf0ec65ab129536c20196a05d593ceb59b4 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- doc/configure.man	(.../configure.man)	(revision 0228cdf0ec65ab129536c20196a05d593ceb59b4)
+++ doc/configure.man	(.../configure.man)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -3,7 +3,7 @@
 [include version.inc]
 [manpage_begin nx::configure 3 [vset VERSION]]
 
-[copyright { 2014 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>; available under the Creative Commons Attribution 3.0 Austria license (CC BY 3.0 AT).}]
+[copyright {2014-16 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>; available under the Creative Commons Attribution 3.0 Austria license (CC BY 3.0 AT).}]
 
 [titledesc {Get and set configuration options on the object system}]
 [moddesc {NX API}]
Index: doc/current.man
===================================================================
diff -u -rd49b5f90fec18930612d4fe2a36463226e94eb3b -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- doc/current.man	(.../current.man)	(revision d49b5f90fec18930612d4fe2a36463226e94eb3b)
+++ doc/current.man	(.../current.man)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -3,7 +3,7 @@
 [include version.inc]
 [manpage_begin nx::current 3 [vset VERSION]]
 
-[copyright { 2014-2016 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>; available under the Creative Commons Attribution 3.0 Austria license (CC BY 3.0 AT).}]
+[copyright {2014-16 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>; available under the Creative Commons Attribution 3.0 Austria license (CC BY 3.0 AT).}]
 
 [titledesc {Return information about the method callstack}]
 [moddesc {NX API}]
Index: doc/next.man
===================================================================
diff -u -r0228cdf0ec65ab129536c20196a05d593ceb59b4 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- doc/next.man	(.../next.man)	(revision 0228cdf0ec65ab129536c20196a05d593ceb59b4)
+++ doc/next.man	(.../next.man)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -3,7 +3,7 @@
 [include version.inc]
 [manpage_begin nx::next 3 [vset VERSION]]
 
-[copyright {2014 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>}]
+[copyright {2014-16 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>}]
 [titledesc {Skip to the next most specific method implementation}]
 [moddesc {NX API}]
 
Index: doc/nxsh.man
===================================================================
diff -u -r0228cdf0ec65ab129536c20196a05d593ceb59b4 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- doc/nxsh.man	(.../nxsh.man)	(revision 0228cdf0ec65ab129536c20196a05d593ceb59b4)
+++ doc/nxsh.man	(.../nxsh.man)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -3,7 +3,7 @@
 [include version.inc]
 [manpage_begin nxsh 1 [vset VERSION]]
 
-[copyright {2014,2016 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>; available under the Creative Commons Attribution 3.0 Austria license (CC BY 3.0 AT).}]
+[copyright {2014-16 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>; available under the Creative Commons Attribution 3.0 Austria license (CC BY 3.0 AT).}]
 
 [titledesc {Simple shell containing NSF/NX interpreter}]
 [moddesc {Command-line interface}]
Index: doc/nxwish.man
===================================================================
diff -u -r0228cdf0ec65ab129536c20196a05d593ceb59b4 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- doc/nxwish.man	(.../nxwish.man)	(revision 0228cdf0ec65ab129536c20196a05d593ceb59b4)
+++ doc/nxwish.man	(.../nxwish.man)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -3,7 +3,7 @@
 [include version.inc]
 [manpage_begin nxwish 1 [vset VERSION]]
 
-[copyright {2014 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>; available under the Creative Commons Attribution 3.0 Austria license (CC BY 3.0 AT).}]
+[copyright {2014-16 Stefan Sobernig <stefan.sobernig@wu.ac.at>, Gustaf Neumann <gustaf.neumann@wu.ac.at>; available under the Creative Commons Attribution 3.0 Austria license (CC BY 3.0 AT).}]
 
 [titledesc {Simple windowing shell containing NSF/NX interpreter}]
 [moddesc {Command-line interface}]
Index: generic/nsf.c
===================================================================
diff -u -r641d41d10b614aa4d95dc9144f21261873301e5c -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- generic/nsf.c	(.../nsf.c)	(revision 641d41d10b614aa4d95dc9144f21261873301e5c)
+++ generic/nsf.c	(.../nsf.c)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -8,7 +8,7 @@
  * Copyright (C) 1999-2016 Gustaf Neumann (a) (b)
  * Copyright (C) 1999-2007 Uwe Zdun (a) (b)
  * Copyright (C) 2007-2008 Martin Matuska (b)
- * Copyright (C) 2010-2015 Stefan Sobernig (b)
+ * Copyright (C) 2010-2016 Stefan Sobernig (b)
  *
  *
  * (a) University of Essen
Index: generic/nsf.h
===================================================================
diff -u -r5abaa156b260f0a0f052cfc6e2f6b2f7eff81e06 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- generic/nsf.h	(.../nsf.h)	(revision 5abaa156b260f0a0f052cfc6e2f6b2f7eff81e06)
+++ generic/nsf.h	(.../nsf.h)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -1,10 +1,10 @@
 /*
  *  Next Scripting Framework
  *
- *  Copyright (C) 1999-2014 Gustaf Neumann (a) (b)
+ *  Copyright (C) 1999-2016 Gustaf Neumann (a) (b)
  *  Copyright (C) 1999-2007 Uwe Zdun (a) (b)
  *  Copyright (C) 2007-2008 Martin Matuska (b)
- *  Copyright (C) 2010-2014 Stefan Sobernig (b)
+ *  Copyright (C) 2010-2016 Stefan Sobernig (b)
  *
  * (a) University of Essen
  *     Specification of Software Systems
Index: generic/nsfInt.h
===================================================================
diff -u -r4b4a7349ffab8d3629796f3b56a47cbc19e72d88 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 4b4a7349ffab8d3629796f3b56a47cbc19e72d88)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -6,7 +6,7 @@
  *
  *  Copyright (C) 1999-2016 Gustaf Neumann (a, b)
  *  Copyright (C) 1999-2007 Uwe Zdun (a, b)
- *  Copyright (C) 2011-2013 Stefan Sobernig (b)
+ *  Copyright (C) 2011-2016 Stefan Sobernig (b)
  *
  * (a) University of Essen
  *     Specification of Software Systems
Index: generic/nsfObj.c
===================================================================
diff -u -r1ce1f6ae113abec0f18b5a35d7b272f0f944dfc9 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- generic/nsfObj.c	(.../nsfObj.c)	(revision 1ce1f6ae113abec0f18b5a35d7b272f0f944dfc9)
+++ generic/nsfObj.c	(.../nsfObj.c)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -1,9 +1,10 @@
 /*
- * nsfError.c --
+ * nsfObj.c --
  *
  *      Tcl_Obj types provided by the Next Scripting Framework.
  *
- * Copyright (C) 1999-2014 Gustaf Neumann
+ * Copyright (C) 1999-2016 Gustaf Neumann
+ * Copyright (C) 2016 Stefan Sobernig
  *
  * Vienna University of Economics and Business
  * Institute of Information Systems and New Media
Index: generic/nsfStack.c
===================================================================
diff -u -r114df8b23fa9e2e1ff71b959e42da5e0883354c4 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- generic/nsfStack.c	(.../nsfStack.c)	(revision 114df8b23fa9e2e1ff71b959e42da5e0883354c4)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -4,7 +4,7 @@
  *      Stack handling functions of the Next Scripting Framework.
  *
  * Copyright (C) 2010-2016 Gustaf Neumann
- * Copyright (C) 2011-2015 Stefan Sobernig
+ * Copyright (C) 2011-2016 Stefan Sobernig
  *
  * Vienna University of Economics and Business
  * Institute of Information Systems and New Media
Index: library/lib/nx-shell.tcl
===================================================================
diff -u -rf69105999ff5876732032cd779f3f7521ab010e5 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- library/lib/nx-shell.tcl	(.../nx-shell.tcl)	(revision f69105999ff5876732032cd779f3f7521ab010e5)
+++ library/lib/nx-shell.tcl	(.../nx-shell.tcl)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -1,3 +1,43 @@
+# -*- tcl -*-
+############################################################
+# nx-shell.tcl --
+#
+#      Scripted shell (REPL) infrastructure for NX and XOTcl2.
+#
+# Copyright (C) 2010-2012 Gustaf Neumann
+# Copyright (C) 2016 Stefan Sobernig
+#
+# Vienna University of Economics and Business
+# Institute of Information Systems and New Media
+# A-1020, Welthandelsplatz 1
+# Vienna, Austria
+#
+# This work is licensed under the MIT License http://www.opensource.org/licenses/MIT
+#
+# Copyright:
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+
 package require nx
 
 package provide nx::shell 1.1
Index: library/nx/nx.tcl
===================================================================
diff -u -r371cc41c32db500cb1d5bcab139ef65299ef4d6c -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- library/nx/nx.tcl	(.../nx.tcl)	(revision 371cc41c32db500cb1d5bcab139ef65299ef4d6c)
+++ library/nx/nx.tcl	(.../nx.tcl)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -6,7 +6,7 @@
 #      system, based on the Next Scripting Framework (NSF).
 #
 # Copyright (C) 2010-2016 Gustaf Neumann
-# Copyright (C) 2010-2014 Stefan Sobernig
+# Copyright (C) 2010-2016 Stefan Sobernig
 #
 # Vienna University of Economics and Business
 # Institute of Information Systems and New Media
Index: library/xotcl/library/xotcl2.tcl
===================================================================
diff -u -ra1475605d3bb0257ba00dcf9417d30538a201d55 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- library/xotcl/library/xotcl2.tcl	(.../xotcl2.tcl)	(revision a1475605d3bb0257ba00dcf9417d30538a201d55)
+++ library/xotcl/library/xotcl2.tcl	(.../xotcl2.tcl)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -6,7 +6,7 @@
 #      on the Next Scripting Framework (NSF).
 #
 # Copyright (C) 2010-2016 Gustaf Neumann
-# Copyright (C) 2010-2014 Stefan Sobernig
+# Copyright (C) 2010-2016 Stefan Sobernig
 #
 # Vienna University of Economics and Business
 # Institute of Information Systems and New Media
Index: win/makefile.vc
===================================================================
diff -u -r842266c25bfd2eef3221e5c5e3f23b050fd9cd59 -rb8ca306282c9a1000b1c93ffd97f7f4673953f65
--- win/makefile.vc	(.../makefile.vc)	(revision 842266c25bfd2eef3221e5c5e3f23b050fd9cd59)
+++ win/makefile.vc	(.../makefile.vc)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
@@ -15,7 +15,7 @@
 # Copyright (c) 2001-2005 ActiveState Corporation.
 # Copyright (c) 2001-2004 David Gravereaux.
 # Copyright (c) 2003-2008 Pat Thoyts.
-# Copyright (c) 2013-2014 Stefan Sobernig
+# Copyright (c) 2013-2016 Stefan Sobernig
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or