diff --git a/Logtalk/QUICK_START b/Logtalk/QUICK_START
index 012ea914d..1ad5269f5 100644
--- a/Logtalk/QUICK_START
+++ b/Logtalk/QUICK_START
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/README b/Logtalk/README
index a6671e59e..0b84d3929 100644
--- a/Logtalk/README
+++ b/Logtalk/README
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
@@ -82,18 +82,19 @@ Logtalk in any directory that you find convenient.
 
 See the user manual for a description of the source files organization and 
 for installing/using instructions (to read the user manual open the file 
-manuals/index.html with a web browser).
+manuals/index.html with a web browser). Most files are formatted using 
+four-space tabs.
 
 In Unix and Unix-like systems you may want to define an environment variable 
 named $LOGTALKHOME pointing to the Logtalk installation for use with your 
 Prolog compilers. If you use a csh shell, add the following line to your 
 .cshrc file:
 
-	setenv LOGTALKHOME "/your/installation/directory/lgt2160"
+	setenv LOGTALKHOME "/your/installation/directory/lgt2161"
 
 If you use a bash shell, add the following lines to your .profile file:
 
-	LOGTALKHOME="/your/installation/directory/lgt2160"
+	LOGTALKHOME="/your/installation/directory/lgt2161"
 	export LOGTALKHOME
 
 
diff --git a/Logtalk/RELEASE_NOTES b/Logtalk/RELEASE_NOTES
index f0a8751ef..2a840e344 100644
--- a/Logtalk/RELEASE_NOTES
+++ b/Logtalk/RELEASE_NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
@@ -10,6 +10,28 @@ RELEASE NOTES
 =============
 
 
+2.16.1 - March 23, 2004
+
+	The local built-in method parameter/2 can now be used inside categories 
+	(but please read the warnings about such practice on the user manual).
+
+	Updated the Logtalk compiler to report an error when the user tries to 
+	redefine a message sending or external call control construct inside an 
+	object or category.
+
+	Corrected a bug in the compilation of metacalls whose meta-arguments are 
+	variables.
+
+	Removed references to file sax.jar from the scripts used to convert XML 
+	documenting files into (X)HTML. Updated scripts html.sh, htmlnt.cmd, and 
+	htmldos.bat to use XT 20020426a or later version.
+
+	Improved syntax coloring accuracy of built-in predicates and methods for 
+	the SubEthaEdit text editor.
+
+	Updated config file for Qu-Prolog 6.4.
+
+
 2.16.0 - March 3, 2004
 
 	Logtalk is now distributed under the Artistic License 2.0.
diff --git a/Logtalk/UPGRADING b/Logtalk/UPGRADING
index 76dcb502b..be18cdda6 100644
--- a/Logtalk/UPGRADING
+++ b/Logtalk/UPGRADING
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
@@ -68,5 +68,5 @@ Logtalk version 2.15.6 renamed the compiler option "named_anonymous_vars" to
 
 Logtalk 2.16.0 improves support for the declaration and use of operators 
 local to objects and categories. Recompilation of any objects and categories 
-contain operator declarations is needed in order to take advantage of the 
+containing operator declarations is needed in order to take advantage of the 
 improvements made.
diff --git a/Logtalk/examples/NOTES b/Logtalk/examples/NOTES
index 5c73852f8..ff979e32c 100644
--- a/Logtalk/examples/NOTES
+++ b/Logtalk/examples/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/birds/NOTES b/Logtalk/examples/birds/NOTES
index 4c0348c57..2d163dc5e 100644
--- a/Logtalk/examples/birds/NOTES
+++ b/Logtalk/examples/birds/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/birds/SCRIPT b/Logtalk/examples/birds/SCRIPT
index bb4d44ac0..79eaa10d2 100644
--- a/Logtalk/examples/birds/SCRIPT
+++ b/Logtalk/examples/birds/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/bricks/NOTES b/Logtalk/examples/bricks/NOTES
index f9c8658a2..4305be2e3 100644
--- a/Logtalk/examples/bricks/NOTES
+++ b/Logtalk/examples/bricks/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/bricks/SCRIPT b/Logtalk/examples/bricks/SCRIPT
index 1a5a12251..074b540c4 100644
--- a/Logtalk/examples/bricks/SCRIPT
+++ b/Logtalk/examples/bricks/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/classvars/NOTES b/Logtalk/examples/classvars/NOTES
index 581034e8c..4609f9dab 100644
--- a/Logtalk/examples/classvars/NOTES
+++ b/Logtalk/examples/classvars/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/classvars/SCRIPT b/Logtalk/examples/classvars/SCRIPT
index 4e55f6db9..c10532192 100644
--- a/Logtalk/examples/classvars/SCRIPT
+++ b/Logtalk/examples/classvars/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/dcgs/NOTES b/Logtalk/examples/dcgs/NOTES
index 44fdb2095..a25718c90 100644
--- a/Logtalk/examples/dcgs/NOTES
+++ b/Logtalk/examples/dcgs/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/dcgs/SCRIPT b/Logtalk/examples/dcgs/SCRIPT
index cdea4a853..f2730e751 100644
--- a/Logtalk/examples/dcgs/SCRIPT
+++ b/Logtalk/examples/dcgs/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/dynpred/NOTES b/Logtalk/examples/dynpred/NOTES
index 65ab09fe1..1ce4693f3 100644
--- a/Logtalk/examples/dynpred/NOTES
+++ b/Logtalk/examples/dynpred/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/dynpred/SCRIPT b/Logtalk/examples/dynpred/SCRIPT
index e9b65891c..6215e55fd 100644
--- a/Logtalk/examples/dynpred/SCRIPT
+++ b/Logtalk/examples/dynpred/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/errors/NOTES b/Logtalk/examples/errors/NOTES
index efc20b2d0..292ab8708 100644
--- a/Logtalk/examples/errors/NOTES
+++ b/Logtalk/examples/errors/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
@@ -15,7 +15,7 @@ to the Logtalk compiler warning and error reporting. Open the object
 source files in a text editor to better understand how the compiler 
 deals with common programming errors.
 
-Note that the warnings and errors that yoy will get while compiling 
+Note that the warnings and errors that you will get while compiling 
 your files depend on your compiler options (setted explicitly as 
 parameters in the logtalk_compile/2 or logtalk_load/2 built-in 
 predicates or by default in your configuration file).
diff --git a/Logtalk/examples/inheritance/NOTES b/Logtalk/examples/inheritance/NOTES
index 0861d066a..6399cfc2f 100644
--- a/Logtalk/examples/inheritance/NOTES
+++ b/Logtalk/examples/inheritance/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/inheritance/SCRIPT b/Logtalk/examples/inheritance/SCRIPT
index f37ec36f6..f84c74093 100644
--- a/Logtalk/examples/inheritance/SCRIPT
+++ b/Logtalk/examples/inheritance/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/instmethods/NOTES b/Logtalk/examples/instmethods/NOTES
index 4a1502bde..f4bbdfac5 100644
--- a/Logtalk/examples/instmethods/NOTES
+++ b/Logtalk/examples/instmethods/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/instmethods/SCRIPT b/Logtalk/examples/instmethods/SCRIPT
index 00eb38b94..884137c98 100644
--- a/Logtalk/examples/instmethods/SCRIPT
+++ b/Logtalk/examples/instmethods/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/lo/NOTES b/Logtalk/examples/lo/NOTES
index 2a6203776..81a6d6648 100644
--- a/Logtalk/examples/lo/NOTES
+++ b/Logtalk/examples/lo/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/lo/planner/NOTES b/Logtalk/examples/lo/planner/NOTES
index 8934358f9..f0faedac9 100644
--- a/Logtalk/examples/lo/planner/NOTES
+++ b/Logtalk/examples/lo/planner/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/lo/planner/SCRIPT b/Logtalk/examples/lo/planner/SCRIPT
index cff9eaaab..bef2f178e 100644
--- a/Logtalk/examples/lo/planner/SCRIPT
+++ b/Logtalk/examples/lo/planner/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/lo/travellers/NOTES b/Logtalk/examples/lo/travellers/NOTES
index 8c542dc04..2785168e8 100644
--- a/Logtalk/examples/lo/travellers/NOTES
+++ b/Logtalk/examples/lo/travellers/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/lo/travellers/SCRIPT b/Logtalk/examples/lo/travellers/SCRIPT
index a4df85777..0a421c8b3 100644
--- a/Logtalk/examples/lo/travellers/SCRIPT
+++ b/Logtalk/examples/lo/travellers/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/lpa/NOTES b/Logtalk/examples/lpa/NOTES
index 6139af784..032b92900 100644
--- a/Logtalk/examples/lpa/NOTES
+++ b/Logtalk/examples/lpa/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/lpa/SCRIPT b/Logtalk/examples/lpa/SCRIPT
index be9404a18..5fa89383d 100644
--- a/Logtalk/examples/lpa/SCRIPT
+++ b/Logtalk/examples/lpa/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/metapredicates/NOTES b/Logtalk/examples/metapredicates/NOTES
index fc91b1124..586a81094 100644
--- a/Logtalk/examples/metapredicates/NOTES
+++ b/Logtalk/examples/metapredicates/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/metapredicates/SCRIPT b/Logtalk/examples/metapredicates/SCRIPT
index 0e3b6f5c1..4cbcb739a 100644
--- a/Logtalk/examples/metapredicates/SCRIPT
+++ b/Logtalk/examples/metapredicates/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/mi/NOTES b/Logtalk/examples/mi/NOTES
index 0c1ccdfe4..d0b7d9c76 100644
--- a/Logtalk/examples/mi/NOTES
+++ b/Logtalk/examples/mi/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/mi/SCRIPT b/Logtalk/examples/mi/SCRIPT
index d6f6ee598..5c2205fae 100644
--- a/Logtalk/examples/mi/SCRIPT
+++ b/Logtalk/examples/mi/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/miscellaneous/NOTES b/Logtalk/examples/miscellaneous/NOTES
index a5717608c..b55233302 100644
--- a/Logtalk/examples/miscellaneous/NOTES
+++ b/Logtalk/examples/miscellaneous/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/miscellaneous/SCRIPT b/Logtalk/examples/miscellaneous/SCRIPT
index 94df6ae99..e93fa964a 100644
--- a/Logtalk/examples/miscellaneous/SCRIPT
+++ b/Logtalk/examples/miscellaneous/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/msglog/NOTES b/Logtalk/examples/msglog/NOTES
index 5ce361946..a44255392 100644
--- a/Logtalk/examples/msglog/NOTES
+++ b/Logtalk/examples/msglog/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/msglog/SCRIPT b/Logtalk/examples/msglog/SCRIPT
index 612dd85cf..6b36e7045 100644
--- a/Logtalk/examples/msglog/SCRIPT
+++ b/Logtalk/examples/msglog/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/operators/NOTES b/Logtalk/examples/operators/NOTES
index 944965a6b..2c33df965 100644
--- a/Logtalk/examples/operators/NOTES
+++ b/Logtalk/examples/operators/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/operators/SCRIPT b/Logtalk/examples/operators/SCRIPT
index 58a780014..cdc6afee8 100644
--- a/Logtalk/examples/operators/SCRIPT
+++ b/Logtalk/examples/operators/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/parametric/NOTES b/Logtalk/examples/parametric/NOTES
index c287a9169..88a4072ec 100644
--- a/Logtalk/examples/parametric/NOTES
+++ b/Logtalk/examples/parametric/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/parametric/SCRIPT b/Logtalk/examples/parametric/SCRIPT
index 8311de20c..a723c7e8a 100644
--- a/Logtalk/examples/parametric/SCRIPT
+++ b/Logtalk/examples/parametric/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/points/NOTES b/Logtalk/examples/points/NOTES
index d3b436fd9..61cc61e8a 100644
--- a/Logtalk/examples/points/NOTES
+++ b/Logtalk/examples/points/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/points/SCRIPT b/Logtalk/examples/points/SCRIPT
index b6b15530f..2b136b46e 100644
--- a/Logtalk/examples/points/SCRIPT
+++ b/Logtalk/examples/points/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/polygons/NOTES b/Logtalk/examples/polygons/NOTES
index a634f7b63..69d935d50 100644
--- a/Logtalk/examples/polygons/NOTES
+++ b/Logtalk/examples/polygons/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/polygons/SCRIPT b/Logtalk/examples/polygons/SCRIPT
index d4d5bebba..f43698d32 100644
--- a/Logtalk/examples/polygons/SCRIPT
+++ b/Logtalk/examples/polygons/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/profiling/NOTES b/Logtalk/examples/profiling/NOTES
index d96a11e61..7f836d0e9 100644
--- a/Logtalk/examples/profiling/NOTES
+++ b/Logtalk/examples/profiling/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/profiling/SCRIPT b/Logtalk/examples/profiling/SCRIPT
index 0940c2ac9..ddf2ee87a 100644
--- a/Logtalk/examples/profiling/SCRIPT
+++ b/Logtalk/examples/profiling/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/reflection/NOTES b/Logtalk/examples/reflection/NOTES
index d5df40bdf..f74504198 100644
--- a/Logtalk/examples/reflection/NOTES
+++ b/Logtalk/examples/reflection/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/reflection/SCRIPT b/Logtalk/examples/reflection/SCRIPT
index e6f9edf53..8e2b503a7 100644
--- a/Logtalk/examples/reflection/SCRIPT
+++ b/Logtalk/examples/reflection/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/relations/NOTES b/Logtalk/examples/relations/NOTES
index 42f0550a9..5d63be545 100644
--- a/Logtalk/examples/relations/NOTES
+++ b/Logtalk/examples/relations/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/relations/SCRIPT b/Logtalk/examples/relations/SCRIPT
index 1523a26a0..d672cfc02 100644
--- a/Logtalk/examples/relations/SCRIPT
+++ b/Logtalk/examples/relations/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/roots/NOTES b/Logtalk/examples/roots/NOTES
index cf367b16f..b3f9ea66d 100644
--- a/Logtalk/examples/roots/NOTES
+++ b/Logtalk/examples/roots/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/roots/SCRIPT b/Logtalk/examples/roots/SCRIPT
index 64bff6aeb..752b5db08 100644
--- a/Logtalk/examples/roots/SCRIPT
+++ b/Logtalk/examples/roots/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/searching/NOTES b/Logtalk/examples/searching/NOTES
index b6e539ac7..b4cd38c7f 100644
--- a/Logtalk/examples/searching/NOTES
+++ b/Logtalk/examples/searching/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/searching/SCRIPT b/Logtalk/examples/searching/SCRIPT
index eb5472f67..74bf0c173 100644
--- a/Logtalk/examples/searching/SCRIPT
+++ b/Logtalk/examples/searching/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/shapes/NOTES b/Logtalk/examples/shapes/NOTES
index bb9d730b8..142d79525 100644
--- a/Logtalk/examples/shapes/NOTES
+++ b/Logtalk/examples/shapes/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/shapes/ch/NOTES b/Logtalk/examples/shapes/ch/NOTES
index ddc77ea4b..eb8c27ff3 100644
--- a/Logtalk/examples/shapes/ch/NOTES
+++ b/Logtalk/examples/shapes/ch/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/shapes/ch/SCRIPT b/Logtalk/examples/shapes/ch/SCRIPT
index 7e1d5d291..c6be37fd9 100644
--- a/Logtalk/examples/shapes/ch/SCRIPT
+++ b/Logtalk/examples/shapes/ch/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/shapes/ph/NOTES b/Logtalk/examples/shapes/ph/NOTES
index 7963a25a6..55ee05180 100644
--- a/Logtalk/examples/shapes/ph/NOTES
+++ b/Logtalk/examples/shapes/ph/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/shapes/ph/SCRIPT b/Logtalk/examples/shapes/ph/SCRIPT
index f026301f2..62d255bc5 100644
--- a/Logtalk/examples/shapes/ph/SCRIPT
+++ b/Logtalk/examples/shapes/ph/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/sicstus/NOTES b/Logtalk/examples/sicstus/NOTES
index 6df673dda..17aabcc16 100644
--- a/Logtalk/examples/sicstus/NOTES
+++ b/Logtalk/examples/sicstus/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/sicstus/SCRIPT b/Logtalk/examples/sicstus/SCRIPT
index 42e63d669..0b6e4437c 100644
--- a/Logtalk/examples/sicstus/SCRIPT
+++ b/Logtalk/examples/sicstus/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/symdiff/NOTES b/Logtalk/examples/symdiff/NOTES
index 9d0a4847a..692825af3 100644
--- a/Logtalk/examples/symdiff/NOTES
+++ b/Logtalk/examples/symdiff/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/symdiff/SCRIPT b/Logtalk/examples/symdiff/SCRIPT
index 334596354..2306683e8 100644
--- a/Logtalk/examples/symdiff/SCRIPT
+++ b/Logtalk/examples/symdiff/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/viewpoints/NOTES b/Logtalk/examples/viewpoints/NOTES
index c477ee3fc..e5c7e3fd7 100644
--- a/Logtalk/examples/viewpoints/NOTES
+++ b/Logtalk/examples/viewpoints/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/examples/viewpoints/SCRIPT b/Logtalk/examples/viewpoints/SCRIPT
index 55e9fe1b6..918986385 100644
--- a/Logtalk/examples/viewpoints/SCRIPT
+++ b/Logtalk/examples/viewpoints/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/NOTES b/Logtalk/library/NOTES
index 0cb32f9e5..bfdd37dfb 100644
--- a/Logtalk/library/NOTES
+++ b/Logtalk/library/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/SCRIPT b/Logtalk/library/SCRIPT
index 29286d56d..fb87de2de 100644
--- a/Logtalk/library/SCRIPT
+++ b/Logtalk/library/SCRIPT
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/all.notes b/Logtalk/library/all.notes
index 9b1eb2e31..cd7e80b98 100644
--- a/Logtalk/library/all.notes
+++ b/Logtalk/library/all.notes
@@ -1,7 +1,7 @@
 
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/dates.notes b/Logtalk/library/dates.notes
index 298f494ff..35ec17a83 100644
--- a/Logtalk/library/dates.notes
+++ b/Logtalk/library/dates.notes
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/debugging.notes b/Logtalk/library/debugging.notes
index ae53012f1..c774fd9d8 100644
--- a/Logtalk/library/debugging.notes
+++ b/Logtalk/library/debugging.notes
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/dependents.notes b/Logtalk/library/dependents.notes
index 7c0a73ff7..8d3f4fcf3 100644
--- a/Logtalk/library/dependents.notes
+++ b/Logtalk/library/dependents.notes
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/events.notes b/Logtalk/library/events.notes
index e2bbaa1d4..0f9d110e6 100644
--- a/Logtalk/library/events.notes
+++ b/Logtalk/library/events.notes
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/hierarchies.notes b/Logtalk/library/hierarchies.notes
index d0c72fe9d..fad50e885 100644
--- a/Logtalk/library/hierarchies.notes
+++ b/Logtalk/library/hierarchies.notes
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/metapredicates.notes b/Logtalk/library/metapredicates.notes
index 9670792e6..f8c646eaf 100644
--- a/Logtalk/library/metapredicates.notes
+++ b/Logtalk/library/metapredicates.notes
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/random.notes b/Logtalk/library/random.notes
index 9b00f2329..384360593 100644
--- a/Logtalk/library/random.notes
+++ b/Logtalk/library/random.notes
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/library/types.notes b/Logtalk/library/types.notes
index 09d829af4..ff09a57ca 100644
--- a/Logtalk/library/types.notes
+++ b/Logtalk/library/types.notes
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/manuals/NOTES b/Logtalk/manuals/NOTES
index 6a6ffa078..626b8b20c 100644
--- a/Logtalk/manuals/NOTES
+++ b/Logtalk/manuals/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/manuals/index.html b/Logtalk/manuals/index.html
index 6dc441fa2..6eeda2f2b 100644
--- a/Logtalk/manuals/index.html
+++ b/Logtalk/manuals/index.html
@@ -8,7 +8,7 @@
 
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-	<title>Logtalk 2.16.0 Documentation</title>
+	<title>Logtalk 2.16.1 Documentation</title>
 	<link rel="stylesheet" href="styles.css" type="text/css" />
 </head>
 
@@ -18,7 +18,7 @@
 &nbsp;
 </div>
 
-<h1>Logtalk 2.16.0 Documentation</h1>
+<h1>Logtalk 2.16.1 Documentation</h1>
 
 <ul>
 	<li><h2><a href="userman/index.html">User Manual</a></h2></li>
@@ -37,7 +37,7 @@ Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a
 </div>
 
 <div class="footer">
-<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: February 11, 2004</span></p>
+<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: March 6, 2004</span></p>
 </div>
 
 </body>
diff --git a/Logtalk/manuals/userman/index.html b/Logtalk/manuals/userman/index.html
index de689a258..72430b05c 100644
--- a/Logtalk/manuals/userman/index.html
+++ b/Logtalk/manuals/userman/index.html
@@ -227,7 +227,7 @@ Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a
 </div>
 
 <div class="footer">
-<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: February 11, 2004</span></p>
+<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: March 6, 2004</span></p>
 </div>
 </body>
 </html>
diff --git a/Logtalk/manuals/userman/predicates.html b/Logtalk/manuals/userman/predicates.html
index d417f5364..0124e2016 100644
--- a/Logtalk/manuals/userman/predicates.html
+++ b/Logtalk/manuals/userman/predicates.html
@@ -251,7 +251,7 @@ Logtalk defines a set of built-in object predicates or methods to access message
 <h3>Local methods<a name="local"></a></h3>
 
 <p>
-Logtalk defines four built-in methods to access an object execution context. These methods are compiled in-line and can be freely used without worrying about performance penalties.
+Logtalk defines four built-in methods to access an object execution context. These methods are compiled in-line and can be freely used without worrying about performance penalties. When called from inside a category, these methods refer to the execution context of the object importing the category.
 </p>
 <p>
 To find the object that received the message under execution we may use the <a title="Consult reference manual" href="../refman/methods/self1.html"><code>self/1</code></a> method. We may also retrieve the object that has sent the message under execution using the <a title="Consult reference manual" href="../refman/methods/sender1.html"><code>sender/1</code></a> method.
@@ -317,6 +317,7 @@ After compiling and loading these two objects, we can try the following goal:
     Color parameter value is blue
     yes
 </pre>
+The method <code>parameter/2</code> is only compiled in-ilne when used inside objects; its use inside categories implies a call to the built-in Prolog predicate <code>arg/3</code>. Nevertheless, note that calls to <code>parameter/2</code> from inside categories are inherently problematic: a category may be implemented by several objects, both parametric (with different number of parameters) and non-parametric. Care must be taken to ensure that a parametric object importing such a category match the interpretation of its parameters used in the category.
 
 <h3>Database methods<a name="database"></a></h3>
 
@@ -392,7 +393,7 @@ Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a
 </div>
 
 <div class="footer">
-<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: February 11, 2004</span></p>
+<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: March 6, 2004</span></p>
 </div>
 </body>
 </html>
diff --git a/Logtalk/wenv/NOTES b/Logtalk/wenv/NOTES
index 5b2f18a82..26b5ec86e 100644
--- a/Logtalk/wenv/NOTES
+++ b/Logtalk/wenv/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/wenv/emacs/NOTES b/Logtalk/wenv/emacs/NOTES
index 198b0e59e..99bc8ead7 100644
--- a/Logtalk/wenv/emacs/NOTES
+++ b/Logtalk/wenv/emacs/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/wenv/emacs/logtalk.el b/Logtalk/wenv/emacs/logtalk.el
index e6236c6eb..ee48944b2 100644
--- a/Logtalk/wenv/emacs/logtalk.el
+++ b/Logtalk/wenv/emacs/logtalk.el
@@ -4,12 +4,19 @@
 
 ;; Author: Paulo Moura
 ;; Creation date: November 15, 2003
-;; Last modification date: February 23, 2004
-;; Version: 0.51
+;; Last modification date: March 5, 2004
+;; Version: 0.52
 
 ;; Installation:
 ;;
-;; Add the following lines in your Emacs init file, for example
+;; First, copy this file to the appropriated directory. For FSF Emacs this will 
+;; probably be /usr/local/share/emacs/site-lisp. For XEmacs, the directory is
+;; usully /usr/local/lib/xemacs/site-lisp. You may also copy the file to a 
+;; sub-directory in your home directory depending on your Emacs configuration.
+;; Type "C-h v load-path" in Emacs to find the list of paths that are searched
+;; for when looking for lisp files.
+;;
+;; Second, add the following lines in your Emacs init file, for example
 ;; your ~/.emacs file:
 ;;
 ;; (autoload 'logtalk-mode "logtalk" "Major mode for editing Logtalk programs." t)
diff --git a/Logtalk/wenv/jedit/NOTES b/Logtalk/wenv/jedit/NOTES
index c5d701190..663d94336 100644
--- a/Logtalk/wenv/jedit/NOTES
+++ b/Logtalk/wenv/jedit/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/wenv/kate/NOTES b/Logtalk/wenv/kate/NOTES
index 209415ebe..213187ea3 100644
--- a/Logtalk/wenv/kate/NOTES
+++ b/Logtalk/wenv/kate/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
@@ -17,7 +17,7 @@ To install copy the file "logtalk.xml" to the directory:
 
 or:
     
-    ~/.kde/share/apps/katepart/syntax
+    ~/.kde/share/apps/katepart/syntax/
 
 and restart Kate and Kwrite.
 
diff --git a/Logtalk/wenv/kate/logtalk.xml b/Logtalk/wenv/kate/logtalk.xml
index 3de1662e1..dbbdd5a11 100644
--- a/Logtalk/wenv/kate/logtalk.xml
+++ b/Logtalk/wenv/kate/logtalk.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
 
-<language name="Logtalk" version="1.0" kateversion="2.2" section="Sources" extensions="*.lgt;*.loader;*.config" mimetype="text/x-logtalk">
+<language
+	name="Logtalk" version="1.01" kateversion="2.1" section="Sources"
+	extensions="*.lgt;*.loader;*.config" mimetype="text/x-logtalk"
+	author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0">
 
     <highlighting>
 
diff --git a/Logtalk/wenv/nedit/NOTES b/Logtalk/wenv/nedit/NOTES
index a16d20d00..d4ff51f8f 100644
--- a/Logtalk/wenv/nedit/NOTES
+++ b/Logtalk/wenv/nedit/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/wenv/pb/Logtalk.pbfilespec b/Logtalk/wenv/pb/Logtalk.pbfilespec
deleted file mode 100644
index 1c8ede895..000000000
--- a/Logtalk/wenv/pb/Logtalk.pbfilespec
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
-	Logtalk source file specs.
-*/
-(
-{
-  Identifier = sourcecode.lgt;
-  BasedOn = sourcecode;
-  Extensions = (lgt);
-  MIMETypes = ("text/x-logtalk");
-  ComputerLanguage = logtalk;
-}
-)
diff --git a/Logtalk/wenv/pb/Logtalk.pblangspec b/Logtalk/wenv/pb/Logtalk.pblangspec
deleted file mode 100644
index a650edc32..000000000
--- a/Logtalk/wenv/pb/Logtalk.pblangspec
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
-   Logtalk language specification.
-*/
-
-(
-{
-	Identifier = logtalk;
-  	Name = "Logtalk";
-  	Description = "Logtalk";
-  	BasedOn = c;
-  	SyntaxColoring = {
-    	CaseSensitive = YES;
-		IdentifierStartChars = "_";
-    	IdentifierChars = "_";
-    	MultiLineComment = (
-     	    ( "/*", "*/" )
-        );
-        CommentsCanBeNested = YES;
-    	SingleLineComment = ("%");
-		String = (
-	   	   	("'", "'")
-		);
-		Character = (
-                ( "'", "'" )
-         );
-    	EscapeCharacter = "\\";
-    	Keywords = (
-      		"category",
-			"end_category",
-			"end_object",
-			"end_protocol",
-			"object",
-			"protocol",
-		);
-		AltKeywords = (
-			"initialization",
-			"info",
-			"mode",
-			"dynamic",
-			"discontiguous",
-			"public",
-			"protected",
-			"private",
-			"metapredicate",
-			"op",
-			"calls",
-			"uses",					
-		);
-		PreprocessorKeywordStart = "";
-		PreprocessorKeywords = (
-		);
-  	};
-}
-)
-
diff --git a/Logtalk/wenv/pb/Logtalk/Category.lgt b/Logtalk/wenv/pb/Logtalk/Category.lgt
deleted file mode 100644
index 1983cc76a..000000000
--- a/Logtalk/wenv/pb/Logtalk/Category.lgt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-:- category(Category,
-	implements(Protocol)).
-
-	:- info([
-		version is 1.0,
-		author is 'ÇFULLUSERNAMEÈ',
-		date is ÇYEARÈ/02/01,
-		comment is '']).
-
-
-
-:- end_category.
diff --git a/Logtalk/wenv/pb/Logtalk/Class.lgt b/Logtalk/wenv/pb/Logtalk/Class.lgt
deleted file mode 100644
index baea5c6fc..000000000
--- a/Logtalk/wenv/pb/Logtalk/Class.lgt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-:- object(Class,
-	implements(Protocol),
-	imports(Category),
-	instantiates(Metaclass),
-	specializes(Superclass)).
-
-	:- info([
-		version is 1.0,
-		author is 'ÇFULLUSERNAMEÈ',
-		date is ÇYEARÈ/02/01,
-		comment is '']).
-
-
-
-:- end_object.
diff --git a/Logtalk/wenv/pb/Logtalk/Instance.lgt b/Logtalk/wenv/pb/Logtalk/Instance.lgt
deleted file mode 100644
index d368a117d..000000000
--- a/Logtalk/wenv/pb/Logtalk/Instance.lgt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-:- object(Instance,
-	instantiates(Class)).
-
-	:- info([
-		version is 1.0,
-		author is 'ÇFULLUSERNAMEÈ',
-		date is ÇYEARÈ/02/01,
-		comment is '']).
-
-
-
-:- end_object.
diff --git a/Logtalk/wenv/pb/Logtalk/Parametric class.lgt b/Logtalk/wenv/pb/Logtalk/Parametric class.lgt
deleted file mode 100644
index 7a881667f..000000000
--- a/Logtalk/wenv/pb/Logtalk/Parametric class.lgt	
+++ /dev/null
@@ -1,17 +0,0 @@
-
-:- object(Class(),
-	implements(Protocol),
-	imports(Category),
-	instantiates(Metaclass()),
-	specializes(Superclass())).
-
-	:- info([
-		version is 1.0,
-		author is 'ÇFULLUSERNAMEÈ',
-		date is ÇYEARÈ/02/01,
-		comment is '',
-		parnames is []]).
-
-
-
-:- end_object.
diff --git a/Logtalk/wenv/pb/Logtalk/Parametric instance.lgt b/Logtalk/wenv/pb/Logtalk/Parametric instance.lgt
deleted file mode 100644
index 71b0783a9..000000000
--- a/Logtalk/wenv/pb/Logtalk/Parametric instance.lgt	
+++ /dev/null
@@ -1,14 +0,0 @@
-
-:- object(Instance(),
-	instantiates(Class())).
-
-	:- info([
-		version is 1.0,
-		author is 'ÇFULLUSERNAMEÈ',
-		date is ÇYEARÈ/02/01,
-		comment is '',
-		parnames is []]).
-
-
-
-:- end_object.
diff --git a/Logtalk/wenv/pb/Logtalk/Parametric prototype.lgt b/Logtalk/wenv/pb/Logtalk/Parametric prototype.lgt
deleted file mode 100644
index 2eaf61e2d..000000000
--- a/Logtalk/wenv/pb/Logtalk/Parametric prototype.lgt	
+++ /dev/null
@@ -1,16 +0,0 @@
-
-:- object(Object(),
-	implements(Protocol),
-	imports(Category),
-	extends(Parent())).
-
-	:- info([
-		version is 1.0,
-		author is 'ÇFULLUSERNAMEÈ',
-		date is ÇYEARÈ/02/01,
-		comment is '',
-		parnames is []]).
-
-
-
-:- end_object.
diff --git a/Logtalk/wenv/pb/Logtalk/Private predicate templates.lgt b/Logtalk/wenv/pb/Logtalk/Private predicate templates.lgt
deleted file mode 100644
index 343cb71ec..000000000
--- a/Logtalk/wenv/pb/Logtalk/Private predicate templates.lgt	
+++ /dev/null
@@ -1,35 +0,0 @@
-
-	:- private(Functor/0).
-	:- mode(Functor, Solutions).
-	:- info(Functor/0, [
-		comment is '']).
-
-	:- private(Functor/1).
-	:- mode(Functor(), Solutions).
-	:- info(Functor/1, [
-		comment is '',
-		argnames is ['Arg']]).
-
-	:- private(Functor/2).
-	:- mode(Functor(, ), Solutions).
-	:- info(Functor/2, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2']]).
-
-	:- private(Functor/3).
-	:- mode(Functor(, , ), Solutions).
-	:- info(Functor/3, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2', 'Arg3']]).
-
-	:- private(Functor/4).
-	:- mode(Functor(, , , ), Solutions).
-	:- info(Functor/4, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4']]).
-
-	:- private(Functor/5).
-	:- mode(Functor(, , , , ), Solutions).
-	:- info(Functor/5, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4', 'Arg5']]).
diff --git a/Logtalk/wenv/pb/Logtalk/Protected predicate templates.lgt b/Logtalk/wenv/pb/Logtalk/Protected predicate templates.lgt
deleted file mode 100644
index 7edae6526..000000000
--- a/Logtalk/wenv/pb/Logtalk/Protected predicate templates.lgt	
+++ /dev/null
@@ -1,35 +0,0 @@
-
-	:- protected(Functor/0).
-	:- mode(Functor, Solutions).
-	:- info(Functor/0, [
-		comment is '']).
-
-	:- protected(Functor/1).
-	:- mode(Functor(), Solutions).
-	:- info(Functor/1, [
-		comment is '',
-		argnames is ['Arg']]).
-
-	:- protected(Functor/2).
-	:- mode(Functor(, ), Solutions).
-	:- info(Functor/2, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2']]).
-
-	:- protected(Functor/3).
-	:- mode(Functor(, , ), Solutions).
-	:- info(Functor/3, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2', 'Arg3']]).
-
-	:- protected(Functor/4).
-	:- mode(Functor(, , , ), Solutions).
-	:- info(Functor/4, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4']]).
-
-	:- protected(Functor/5).
-	:- mode(Functor(, , , , ), Solutions).
-	:- info(Functor/5, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4', 'Arg5']]).
diff --git a/Logtalk/wenv/pb/Logtalk/Protocol.lgt b/Logtalk/wenv/pb/Logtalk/Protocol.lgt
deleted file mode 100644
index 3de52dec9..000000000
--- a/Logtalk/wenv/pb/Logtalk/Protocol.lgt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-:- protocol(Protocol).
-
-	:- info([
-		version is 1.0,
-		author is 'ÇFULLUSERNAMEÈ',
-		date is ÇYEARÈ/02/01,
-		comment is '']).
-
-
-
-:- end_protocol.
diff --git a/Logtalk/wenv/pb/Logtalk/Prototype.lgt b/Logtalk/wenv/pb/Logtalk/Prototype.lgt
deleted file mode 100644
index 09e5a08bb..000000000
--- a/Logtalk/wenv/pb/Logtalk/Prototype.lgt
+++ /dev/null
@@ -1,15 +0,0 @@
-
-:- object(Object,
-	implements(Protocol),
-	imports(Category),
-	extends(Parent)).
-
-	:- info([
-		version is 1.0,
-		author is 'ÇFULLUSERNAMEÈ',
-		date is ÇYEARÈ/02/01,
-		comment is '']).
-
-
-
-:- end_object.
diff --git a/Logtalk/wenv/pb/Logtalk/Public predicate templates.lgt b/Logtalk/wenv/pb/Logtalk/Public predicate templates.lgt
deleted file mode 100644
index adc1dd1ce..000000000
--- a/Logtalk/wenv/pb/Logtalk/Public predicate templates.lgt	
+++ /dev/null
@@ -1,35 +0,0 @@
-
-	:- public(Functor/0).
-	:- mode(Functor, Solutions).
-	:- info(Functor/0, [
-		comment is '']).
-
-	:- public(Functor/1).
-	:- mode(Functor(), Solutions).
-	:- info(Functor/1, [
-		comment is '',
-		argnames is ['Arg']]).
-
-	:- public(Functor/2).
-	:- mode(Functor(, ), Solutions).
-	:- info(Functor/2, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2']]).
-
-	:- public(Functor/3).
-	:- mode(Functor(, , ), Solutions).
-	:- info(Functor/3, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2', 'Arg3']]).
-
-	:- public(Functor/4).
-	:- mode(Functor(, , , ), Solutions).
-	:- info(Functor/4, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4']]).
-
-	:- public(Functor/5).
-	:- mode(Functor(, , , , ), Solutions).
-	:- info(Functor/5, [
-		comment is '',
-		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4', 'Arg5']]).
diff --git a/Logtalk/wenv/pb/NOTES b/Logtalk/wenv/pb/NOTES
deleted file mode 100644
index 60e048d21..000000000
--- a/Logtalk/wenv/pb/NOTES
+++ /dev/null
@@ -1,28 +0,0 @@
-=================================================================
-Logtalk - Object oriented extension to Prolog
-Release 2.15.5
-
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
-=================================================================
-
-
-This directory contains some files that provide syntax highlighting and 
-templates files for editing Logtalk source files with MacOS X Project 
-Builder 2.1 or later version.
-
-
-To install:
-
-1.	Copy to the directory /Developer/ProjectBuilder Extras/Specifications 
-	the following files:
-
-		Logtalk.pbfilespec
-		Logtalk.pblangspec
-
-2.	Copy to the directory /Developer/ProjectBuilder Extras/File Templates 
-	the following folder:
-
-		Logtalk
-
-
-SUPPORT FOR THIS IDE IS A WORK IN PROGRESS.
diff --git a/Logtalk/wenv/subethaedit/NOTES b/Logtalk/wenv/subethaedit/NOTES
index 77d856a1e..758b94e62 100644
--- a/Logtalk/wenv/subethaedit/NOTES
+++ b/Logtalk/wenv/subethaedit/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/wenv/subethaedit/logtalk.plist b/Logtalk/wenv/subethaedit/logtalk.plist
index 93f860aa3..4e12d32a9 100644
--- a/Logtalk/wenv/subethaedit/logtalk.plist
+++ b/Logtalk/wenv/subethaedit/logtalk.plist
@@ -99,11 +99,11 @@
 			<false/>
 			<key>Regular Expressions</key>
 			<array>
-				<string>[^A-Za-z0-9](instantiates)\(</string>
-				<string>[^A-Za-z0-9](specializes)\(</string>
-				<string>[^A-Za-z0-9](extends)\(</string>
-				<string>[^A-Za-z0-9](imports)\(</string>
-				<string>[^A-Za-z0-9](implements)\(</string>
+				<string>[^A-Za-z0-9_](instantiates)\(</string>
+				<string>[^A-Za-z0-9_](specializes)\(</string>
+				<string>[^A-Za-z0-9_](extends)\(</string>
+				<string>[^A-Za-z0-9_](imports)\(</string>
+				<string>[^A-Za-z0-9_](implements)\(</string>
 			</array>
 		</dict>
 
@@ -156,9 +156,9 @@
 			<false/>
 			<key>Regular Expressions</key>
 			<array>
-				<string>[^A-Za-z0-9](call)\(</string>
-				<string>[^A-Za-z0-9](catch)\(</string>
-				<string>[^A-Za-z0-9](throw)\(</string>
+				<string>[^A-Za-z0-9_](call)\(</string>
+				<string>[^A-Za-z0-9_](catch)\(</string>
+				<string>[^A-Za-z0-9_](throw)\(</string>
 			</array>
 			<key>Plain Strings</key>
 			<array>
@@ -180,25 +180,25 @@
 			<false/>
 			<key>Regular Expressions</key>
 			<array>
-				<string>[^A-Za-z0-9](parameter)\(</string>
-				<string>[^A-Za-z0-9](self)\(</string>
-				<string>[^A-Za-z0-9](sender)\(</string>
-				<string>[^A-Za-z0-9](this)\(</string>
-				<string>[^A-Za-z0-9](current_predicate)\(</string>
-				<string>[^A-Za-z0-9](predicate_property)\(</string>
-				<string>[^A-Za-z0-9](abolish)\(</string>
-				<string>[^A-Za-z0-9](asserta)\(</string>
-				<string>[^A-Za-z0-9](assertz)\(</string>
-				<string>[^A-Za-z0-9](clause)\(</string>
-				<string>[^A-Za-z0-9](retract)\(</string>
-				<string>[^A-Za-z0-9](retractall)\(</string>
-				<string>[^A-Za-z0-9](bagof)\(</string>
-				<string>[^A-Za-z0-9](findall)\(</string>
-				<string>[^A-Za-z0-9](forall)\(</string>
-				<string>[^A-Za-z0-9](setof)\(</string>
-				<string>[^A-Za-z0-9](before)\(</string>
-				<string>[^A-Za-z0-9](after)\(</string>
-				<string>[^A-Za-z0-9](phrase)\(</string>
+				<string>[^A-Za-z0-9_](parameter)\(</string>
+				<string>[^A-Za-z0-9_](self)\(</string>
+				<string>[^A-Za-z0-9_](sender)\(</string>
+				<string>[^A-Za-z0-9_](this)\(</string>
+				<string>[^A-Za-z0-9_](current_predicate)\(</string>
+				<string>[^A-Za-z0-9_](predicate_property)\(</string>
+				<string>[^A-Za-z0-9_](abolish)\(</string>
+				<string>[^A-Za-z0-9_](asserta)\(</string>
+				<string>[^A-Za-z0-9_](assertz)\(</string>
+				<string>[^A-Za-z0-9_](clause)\(</string>
+				<string>[^A-Za-z0-9_](retract)\(</string>
+				<string>[^A-Za-z0-9_](retractall)\(</string>
+				<string>[^A-Za-z0-9_](bagof)\(</string>
+				<string>[^A-Za-z0-9_](findall)\(</string>
+				<string>[^A-Za-z0-9_](forall)\(</string>
+				<string>[^A-Za-z0-9_](setof)\(</string>
+				<string>[^A-Za-z0-9_](before)\(</string>
+				<string>[^A-Za-z0-9_](after)\(</string>
+				<string>[^A-Za-z0-9_](phrase)\(</string>
 			</array>
 		</dict>
 
@@ -215,33 +215,33 @@
 			<false/>
 			<key>Regular Expressions</key>
 			<array>
-				<string>[^A-Za-z0-9](current_object)\(</string>
-				<string>[^A-Za-z0-9](current_protocol)\(</string>
-				<string>[^A-Za-z0-9](current_category)\(</string>
-				<string>[^A-Za-z0-9](create_object)\(</string>
-				<string>[^A-Za-z0-9](create_protocol)\(</string>
-				<string>[^A-Za-z0-9](create_category)\(</string>
-				<string>[^A-Za-z0-9](object_property)\(</string>
-				<string>[^A-Za-z0-9](protocol_property)\(</string>
-				<string>[^A-Za-z0-9](category_property)\(</string>
-				<string>[^A-Za-z0-9](abolish_object)\(</string>
-				<string>[^A-Za-z0-9](abolish_protocol)\(</string>
-				<string>[^A-Za-z0-9](abolish_category)\(</string>
-				<string>[^A-Za-z0-9](extends_object)\(</string>
-				<string>[^A-Za-z0-9](extends_protocol)\(</string>
-				<string>[^A-Za-z0-9](implements_protocol)\(</string>
-				<string>[^A-Za-z0-9](instantiates_class)\(</string>
-				<string>[^A-Za-z0-9](specializes_class)\(</string>
-				<string>[^A-Za-z0-9](imports_category)\(</string>
-				<string>[^A-Za-z0-9](abolish_events)\(</string>
-				<string>[^A-Za-z0-9](current_event)\(</string>
-				<string>[^A-Za-z0-9](define_events)\(</string>
-				<string>[^A-Za-z0-9](current_logtalk_flag)\(</string>
-				<string>[^A-Za-z0-9](set_logtalk_flag)\(</string>
-				<string>[^A-Za-z0-9](logtalk_compile)\(</string>
-				<string>[^A-Za-z0-9](logtalk_load)\(</string>
-				<string>[^A-Za-z0-9](forall)\(</string>
-				<string>[^A-Za-z0-9](retractall)\(</string>
+				<string>[^A-Za-z0-9_](current_object)\(</string>
+				<string>[^A-Za-z0-9_](current_protocol)\(</string>
+				<string>[^A-Za-z0-9_](current_category)\(</string>
+				<string>[^A-Za-z0-9_](create_object)\(</string>
+				<string>[^A-Za-z0-9_](create_protocol)\(</string>
+				<string>[^A-Za-z0-9_](create_category)\(</string>
+				<string>[^A-Za-z0-9_](object_property)\(</string>
+				<string>[^A-Za-z0-9_](protocol_property)\(</string>
+				<string>[^A-Za-z0-9_](category_property)\(</string>
+				<string>[^A-Za-z0-9_](abolish_object)\(</string>
+				<string>[^A-Za-z0-9_](abolish_protocol)\(</string>
+				<string>[^A-Za-z0-9_](abolish_category)\(</string>
+				<string>[^A-Za-z0-9_](extends_object)\(</string>
+				<string>[^A-Za-z0-9_](extends_protocol)\(</string>
+				<string>[^A-Za-z0-9_](implements_protocol)\(</string>
+				<string>[^A-Za-z0-9_](instantiates_class)\(</string>
+				<string>[^A-Za-z0-9_](specializes_class)\(</string>
+				<string>[^A-Za-z0-9_](imports_category)\(</string>
+				<string>[^A-Za-z0-9_](abolish_events)\(</string>
+				<string>[^A-Za-z0-9_](current_event)\(</string>
+				<string>[^A-Za-z0-9_](define_events)\(</string>
+				<string>[^A-Za-z0-9_](current_logtalk_flag)\(</string>
+				<string>[^A-Za-z0-9_](set_logtalk_flag)\(</string>
+				<string>[^A-Za-z0-9_](logtalk_compile)\(</string>
+				<string>[^A-Za-z0-9_](logtalk_load)\(</string>
+				<string>[^A-Za-z0-9_](forall)\(</string>
+				<string>[^A-Za-z0-9_](retractall)\(</string>
 			</array>
 		</dict>
 
@@ -261,16 +261,16 @@
 				<!-- Term unification -->
 				<string>[[:space:]]+(=)[[:space:]]+</string>
 				<string>[[:space:]]+(\\=)[[:space:]]+</string>
-				<string>[^A-Za-z0-9](unify_with_occurs_check)\(</string>
+				<string>[^A-Za-z0-9_](unify_with_occurs_check)\(</string>
 				<!-- Term testing -->
-				<string>[^A-Za-z0-9](var)\(</string>
-				<string>[^A-Za-z0-9](atom)\(</string>
-				<string>[^A-Za-z0-9](integer)\(</string>
-				<string>[^A-Za-z0-9](float)\(</string>
-				<string>[^A-Za-z0-9](atomic)\(</string>
-				<string>[^A-Za-z0-9](compound)\(</string>
-				<string>[^A-Za-z0-9](nonvar)\(</string>
-				<string>[^A-Za-z0-9](number)\(</string>
+				<string>[^A-Za-z0-9_](var)\(</string>
+				<string>[^A-Za-z0-9_](atom)\(</string>
+				<string>[^A-Za-z0-9_](integer)\(</string>
+				<string>[^A-Za-z0-9_](float)\(</string>
+				<string>[^A-Za-z0-9_](atomic)\(</string>
+				<string>[^A-Za-z0-9_](compound)\(</string>
+				<string>[^A-Za-z0-9_](nonvar)\(</string>
+				<string>[^A-Za-z0-9_](number)\(</string>
 				<!-- Term comparison -->
 				<string>[[:space:]]+(==)[[:space:]]+</string>
 				<string>[[:space:]]+(\\==)[[:space:]]+</string>
@@ -279,10 +279,10 @@
 				<string>[[:space:]]+(@&gt;=)[[:space:]]+</string>
 				<string>[[:space:]]+(@&gt;)[[:space:]]+</string>
 				<!-- Term creation and decomposition -->
-				<string>[^A-Za-z0-9](functor)\(</string>
-				<string>[^A-Za-z0-9](arg)\(</string>
+				<string>[^A-Za-z0-9_](functor)\(</string>
+				<string>[^A-Za-z0-9_](arg)\(</string>
 				<string>[[:space:]]+(=\.\.)[[:space:]]+</string>
-				<string>[^A-Za-z0-9](copy_term)\(</string>
+				<string>[^A-Za-z0-9_](copy_term)\(</string>
 				<!-- Arithemtic evaluation -->
 				<string>[[:space:]]+(is)[[:space:]]+</string>
 				<!-- Arithemtic comparison -->
@@ -300,25 +300,25 @@
 				<string>[[:space:]]+(/)[[:space:]]+</string>
 				<string>[[:space:]]+(rem)[[:space:]]+</string>
 				<string>[[:space:]]+(mod)[[:space:]]+</string>
-				<string>[^A-Za-z0-9](rem)\(</string>
-				<string>[^A-Za-z0-9](mod)\(</string>
-				<string>[^A-Za-z0-9](abs)\(</string>
-				<string>[^A-Za-z0-9](sign)\(</string>
-				<string>[^A-Za-z0-9](float_integer_part)\(</string>
-				<string>[^A-Za-z0-9](float_fractional_part)\(</string>
-				<string>[^A-Za-z0-9](float)\(</string>
-				<string>[^A-Za-z0-9](floor)\(</string>
-				<string>[^A-Za-z0-9](truncate)\(</string>
-				<string>[^A-Za-z0-9](round)\(</string>
-				<string>[^A-Za-z0-9](ceiling)\(</string>
+				<string>[^A-Za-z0-9_](rem)\(</string>
+				<string>[^A-Za-z0-9_](mod)\(</string>
+				<string>[^A-Za-z0-9_](abs)\(</string>
+				<string>[^A-Za-z0-9_](sign)\(</string>
+				<string>[^A-Za-z0-9_](float_integer_part)\(</string>
+				<string>[^A-Za-z0-9_](float_fractional_part)\(</string>
+				<string>[^A-Za-z0-9_](float)\(</string>
+				<string>[^A-Za-z0-9_](floor)\(</string>
+				<string>[^A-Za-z0-9_](truncate)\(</string>
+				<string>[^A-Za-z0-9_](round)\(</string>
+				<string>[^A-Za-z0-9_](ceiling)\(</string>
 				<!-- Other arithemtic functors -->
 				<string>[[:space:]]+(\*\*)[[:space:]]+</string>
-				<string>[^A-Za-z0-9](sin)\(</string>
-				<string>[^A-Za-z0-9](cos)\(</string>
-				<string>[^A-Za-z0-9](atan)\(</string>
-				<string>[^A-Za-z0-9](exp)\(</string>
-				<string>[^A-Za-z0-9](log)\(</string>
-				<string>[^A-Za-z0-9](sqrt)\(</string>
+				<string>[^A-Za-z0-9_](sin)\(</string>
+				<string>[^A-Za-z0-9_](cos)\(</string>
+				<string>[^A-Za-z0-9_](atan)\(</string>
+				<string>[^A-Za-z0-9_](exp)\(</string>
+				<string>[^A-Za-z0-9_](log)\(</string>
+				<string>[^A-Za-z0-9_](sqrt)\(</string>
 				<!-- Bitwise functors -->
 				<string>[[:space:]]+(&gt;&gt;)[[:space:]]+</string>
 				<string>[[:space:]]+(&lt;&lt;)[[:space:]]+</string>
@@ -326,55 +326,55 @@
 				<string>[[:space:]]+(\\/)[[:space:]]+</string>
 				<string>[[:space:]]+(\\)[[:space:]]+</string>
 				<!-- Stream selection and control -->
-				<string>[^A-Za-z0-9](current_input)\(</string>
-				<string>[^A-Za-z0-9](current_output)\(</string>
-				<string>[^A-Za-z0-9](set_input)\(</string>
-				<string>[^A-Za-z0-9](set_output)\(</string>
-				<string>[^A-Za-z0-9](open)\(</string>
-				<string>[^A-Za-z0-9](close)\(</string>
-				<string>[^A-Za-z0-9](flush_output)\(</string>
-				<string>[^A-Za-z0-9](stream_property)\(</string>
-				<string>[^A-Za-z0-9](at_end_of_stream)\(</string>
-				<string>[^A-Za-z0-9](set_stream_position)\(</string>
+				<string>[^A-Za-z0-9_](current_input)\(</string>
+				<string>[^A-Za-z0-9_](current_output)\(</string>
+				<string>[^A-Za-z0-9_](set_input)\(</string>
+				<string>[^A-Za-z0-9_](set_output)\(</string>
+				<string>[^A-Za-z0-9_](open)\(</string>
+				<string>[^A-Za-z0-9_](close)\(</string>
+				<string>[^A-Za-z0-9_](flush_output)\(</string>
+				<string>[^A-Za-z0-9_](stream_property)\(</string>
+				<string>[^A-Za-z0-9_](at_end_of_stream)\(</string>
+				<string>[^A-Za-z0-9_](set_stream_position)\(</string>
 				<!-- Character input/output -->
-				<string>[^A-Za-z0-9](get_char)\(</string>
-				<string>[^A-Za-z0-9](get_code)\(</string>
-				<string>[^A-Za-z0-9](peek_char)\(</string>
-				<string>[^A-Za-z0-9](peek_code)\(</string>
-				<string>[^A-Za-z0-9](put_char)\(</string>
-				<string>[^A-Za-z0-9](put_code)\(</string>
-				<string>[^A-Za-z0-9](nl)\(</string>
+				<string>[^A-Za-z0-9_](get_char)\(</string>
+				<string>[^A-Za-z0-9_](get_code)\(</string>
+				<string>[^A-Za-z0-9_](peek_char)\(</string>
+				<string>[^A-Za-z0-9_](peek_code)\(</string>
+				<string>[^A-Za-z0-9_](put_char)\(</string>
+				<string>[^A-Za-z0-9_](put_code)\(</string>
+				<string>[^A-Za-z0-9_](nl)\(</string>
 				<!-- Byte input/output -->
-				<string>[^A-Za-z0-9](get_byte)\(</string>
-				<string>[^A-Za-z0-9](peek_byte)\(</string>
-				<string>[^A-Za-z0-9](put_byte)\(</string>
+				<string>[^A-Za-z0-9_](get_byte)\(</string>
+				<string>[^A-Za-z0-9_](peek_byte)\(</string>
+				<string>[^A-Za-z0-9_](put_byte)\(</string>
 				<!-- Term input/output -->
-				<string>[^A-Za-z0-9](read_term)\(</string>
-				<string>[^A-Za-z0-9](read)\(</string>
-				<string>[^A-Za-z0-9](write_term)\(</string>
-				<string>[^A-Za-z0-9](writeq)\(</string>
-				<string>[^A-Za-z0-9](write)\(</string>
-				<string>[^A-Za-z0-9](write_canonical)\(</string>
-				<string>[^A-Za-z0-9](op)\(</string>
-				<string>[^A-Za-z0-9](current_op)\(</string>
-				<string>[^A-Za-z0-9](char_conversion)\(</string>
-				<string>[^A-Za-z0-9](current_char_conversion)\(</string>
+				<string>[^A-Za-z0-9_](read_term)\(</string>
+				<string>[^A-Za-z0-9_](read)\(</string>
+				<string>[^A-Za-z0-9_](write_term)\(</string>
+				<string>[^A-Za-z0-9_](writeq)\(</string>
+				<string>[^A-Za-z0-9_](write)\(</string>
+				<string>[^A-Za-z0-9_](write_canonical)\(</string>
+				<string>[^A-Za-z0-9_](op)\(</string>
+				<string>[^A-Za-z0-9_](current_op)\(</string>
+				<string>[^A-Za-z0-9_](char_conversion)\(</string>
+				<string>[^A-Za-z0-9_](current_char_conversion)\(</string>
 				<!-- Logic and control -->
 				<string>(\\\+)[[:space:]]+</string>
-				<string>[^A-Za-z0-9](once)\(</string>
+				<string>[^A-Za-z0-9_](once)\(</string>
 				<!-- Atomic term processing -->
-				<string>[^A-Za-z0-9](atom_length)\(</string>
-				<string>[^A-Za-z0-9](atom_concat)\(</string>
-				<string>[^A-Za-z0-9](sub_atom)\(</string>
-				<string>[^A-Za-z0-9](atom_chars)\(</string>
-				<string>[^A-Za-z0-9](atom_codes)\(</string>
-				<string>[^A-Za-z0-9](char_code)\(</string>
-				<string>[^A-Za-z0-9](number_chars)\(</string>
-				<string>[^A-Za-z0-9](number_codes)\(</string>
+				<string>[^A-Za-z0-9_](atom_length)\(</string>
+				<string>[^A-Za-z0-9_](atom_concat)\(</string>
+				<string>[^A-Za-z0-9_](sub_atom)\(</string>
+				<string>[^A-Za-z0-9_](atom_chars)\(</string>
+				<string>[^A-Za-z0-9_](atom_codes)\(</string>
+				<string>[^A-Za-z0-9_](char_code)\(</string>
+				<string>[^A-Za-z0-9_](number_chars)\(</string>
+				<string>[^A-Za-z0-9_](number_codes)\(</string>
 				<!-- Implementation defined hooks functions -->
-				<string>[^A-Za-z0-9](set_prolog_flag)\(</string>
-				<string>[^A-Za-z0-9](current_prolog_flag)\(</string>
-				<string>[^A-Za-z0-9](halt)\(</string>
+				<string>[^A-Za-z0-9_](set_prolog_flag)\(</string>
+				<string>[^A-Za-z0-9_](current_prolog_flag)\(</string>
+				<string>[^A-Za-z0-9_](halt)\(</string>
 			</array>
 			<key>Plain Strings</key>
 			<array>
diff --git a/Logtalk/wenv/tests/NOTES b/Logtalk/wenv/tests/NOTES
index f7ee70e11..39ed15380 100644
--- a/Logtalk/wenv/tests/NOTES
+++ b/Logtalk/wenv/tests/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/wenv/textpad/NOTES b/Logtalk/wenv/textpad/NOTES
index 6c2b96d2d..c82bcdbbd 100644
--- a/Logtalk/wenv/textpad/NOTES
+++ b/Logtalk/wenv/textpad/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/wenv/vim/NOTES b/Logtalk/wenv/vim/NOTES
index 1cd1a0c9f..a73094ee6 100644
--- a/Logtalk/wenv/vim/NOTES
+++ b/Logtalk/wenv/vim/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/wenv/xcode/NOTES b/Logtalk/wenv/xcode/NOTES
index de4a58b41..6e44b9480 100644
--- a/Logtalk/wenv/xcode/NOTES
+++ b/Logtalk/wenv/xcode/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
diff --git a/Logtalk/xml/NOTES b/Logtalk/xml/NOTES
index cfdfc9914..02dc28c70 100644
--- a/Logtalk/xml/NOTES
+++ b/Logtalk/xml/NOTES
@@ -1,6 +1,6 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.16.0
+Release 2.16.1
 
 Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
@@ -115,7 +115,7 @@ html.sh
 	converted files. The title of the index.html can be given as a parameter 
 	to the script. Edit the script to match your environment before running 
 	it and to chose between HTML or XHTML output. Requires James Clarck XT 
-	processor (http://www.jclark.com/xml/xt.html).
+	XSLT processor 20020426a or later version (http://www.jclark.com/xml/).
 
 
 htmlnt.cmd
@@ -125,15 +125,15 @@ htmlnt.cmd
 	converted files. The title of the index.html can be given as a parameter 
 	to the script. Edit the script to match your environment before running 
 	it and to chose between HTML or XHTML output. Requires James Clarck XT 
-	processor (http://www.jclark.com/xml/xt.html).
+	XSLT processor 20020426a or later version (http://www.jclark.com/xml/).
 
 
 htmldos.bat
 
 	Sample DOS batch script to convert .xml files to .html files. Edit the 
 	script to match your environment before running it and to chose between 
-	HTML or XHTML output. Requires James Clarck XT processor 
-	(http://www.jclark.com/xml/xt.html).
+	HTML or XHTML output. Requires James Clarck XT XSLT processor 20020426a 
+	or later version (http://www.jclark.com/xml/).
 
 
 pdf.sh
diff --git a/Logtalk/xml/html.sh b/Logtalk/xml/html.sh
index 5b0abd78e..3577e4933 100644
--- a/Logtalk/xml/html.sh
+++ b/Logtalk/xml/html.sh
@@ -1,11 +1,7 @@
 #!/bin/sh
 
 XT_PATH="/Applications/XML/XT"
-SAX_PATH="/Applications/XML/XT"
-XP_PATH="/Applications/XML/XP"
 # XT_PATH="/usr/local/XT"
-# SAX_PATH="/usr/local/XT"
-# XP_PATH="/usr/local/XP"
 
 XSLT="lgthtml.xsl"
 # XSLT="lgtxhtml.xsl"
@@ -19,7 +15,7 @@ fi
 echo
 echo This script converts all .xml files in the current directory to .html
 echo files applying the XSLT transformation defined in the $XSLT file
-echo using the James Clark XT XSLT Java processor.
+echo using the James Clark XT XSLT Java processor 20020426a or later version.
 echo
 echo An index.html file, containing links to all .html documenting files,
 echo is automatically generated. This file uses the script optional parameter 
@@ -30,7 +26,7 @@ echo converting XML files to HTML...
 for file in *.xml; do
 	echo "  converting" $file
 	name="`expr "$file" : '\(.*\)\.[^./]*$' \| "$file"`"
-	eval java -cp ${XT_PATH}/xt.jar:${SAX_PATH}/sax.jar:${XP_PATH}/xp.jar -Dcom.jclark.xsl.sax.parser=com.jclark.xml.sax.CommentDriver com.jclark.xsl.sax.Driver $file $XSLT $name.html
+	eval java -cp ${XT_PATH}/xt.jar:${XT_PATH}/lib/xp.jar -Dcom.jclark.xsl.sax.parser=com.jclark.xml.sax.CommentDriver com.jclark.xsl.sax.Driver $file $XSLT $name.html
 done
 
 echo conversion done
diff --git a/Logtalk/xml/htmldos.bat b/Logtalk/xml/htmldos.bat
index 2b19d680d..1e65e4462 100644
--- a/Logtalk/xml/htmldos.bat
+++ b/Logtalk/xml/htmldos.bat
@@ -3,17 +3,15 @@
 SET JAVA_HOME=c:\jdk1.3
 
 SET XT_PATH=c:\xt
-SET SAX_PATH=c:\xt
-SET XP_PATH=c:\xt
 
 SET XSLT="lgthtml.xsl"
 REM SET XSLT="lgtxhtml.xsl"
 
 ECHO This script converts all .xml files in the current directory to .html
 ECHO files applying the XSLT transformation defined in the $XSLT file
-ECHO using the James Clark XT XSLT Java processor
+ECHO using the James Clark XT XSLT Java processor 20020426a or later version.
 
-FOR %%f IN (*.xml) DO %JAVA_HOME%\bin\java -cp "%XT_PATH%\xt.jar;%SAX_PATH%\sax.jar;%XP_PATH%\xp.jar" -Dcom.jclark.xsl.sax.parser=com.jclark.xml.sax.CommentDriver com.jclark.xsl.sax.Driver %%f %XSLT% %%f.html
+FOR %%f IN (*.xml) DO %JAVA_HOME%\bin\java -cp "%XT_PATH%\xt.jar;%XT_PATH%\lib\xp.jar" -Dcom.jclark.xsl.sax.parser=com.jclark.xml.sax.CommentDriver com.jclark.xsl.sax.Driver %%f %XSLT% %%f.html
 
 REN *.xml.html *.html
 
diff --git a/Logtalk/xml/htmlnt.cmd b/Logtalk/xml/htmlnt.cmd
index c32eedc3e..7279eca24 100755
--- a/Logtalk/xml/htmlnt.cmd
+++ b/Logtalk/xml/htmlnt.cmd
@@ -3,8 +3,6 @@
 SET JAVA_HOME=c:\jdk1.3
 
 SET XT_PATH=c:\xt
-SET SAX_PATH=c:\xt
-SET XP_PATH=c:\xt
 
 SET XSLT=lgthtml.xsl
 REM SET XSLT=lgtxhtml.xsl
@@ -14,7 +12,7 @@ IF NOT "%1" == "" SET INDEX_TITLE=%1%
 
 ECHO This script converts all .xml files in the current directory to .html
 ECHO files applying the XSLT transformation defined in the $XSLT file
-ECHO using the James Clark XT XSLT Java processor
+ECHO using the James Clark XT XSLT Java processor 20020426a or later version.
 ECHO.
 ECHO An index.html file, containing links to all .html documenting files,
 ECHO is automatically generated. This file uses the script optional parameter 
@@ -24,7 +22,7 @@ ECHO converting XML files to HTML...
 
 FOR /f "tokens=1-2 delims=." %%f IN ('DIR /b *.xml') DO IF EXIST %%f.html DEL %%f.html
 
-FOR /f "tokens=1-2 delims=." %%f IN ('DIR /b *.xml') DO %JAVA_HOME%\bin\java -cp "%XT_PATH%\xt.jar;%SAX_PATH%\sax.jar;%XP_PATH%\xp.jar" -Dcom.jclark.xsl.sax.parser=com.jclark.xml.sax.CommentDriver com.jclark.xsl.sax.Driver %%f.xml %XSLT% %%f.html
+FOR /f "tokens=1-2 delims=." %%f IN ('DIR /b *.xml') DO %JAVA_HOME%\bin\java -cp "%XT_PATH%\xt.jar;%XT_PATH%\lib\xp.jar" -Dcom.jclark.xsl.sax.parser=com.jclark.xml.sax.CommentDriver com.jclark.xsl.sax.Driver %%f.xml %XSLT% %%f.html
 
 ECHO conversion done
 ECHO.
diff --git a/Logtalk/xml/ie50.xsl b/Logtalk/xml/ie50.xsl
index 442407ff4..b09f32a65 100644
--- a/Logtalk/xml/ie50.xsl
+++ b/Logtalk/xml/ie50.xsl
@@ -8,7 +8,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
diff --git a/Logtalk/xml/lgthtml.xsl b/Logtalk/xml/lgthtml.xsl
index 6be6d563e..e172c22c0 100644
--- a/Logtalk/xml/lgthtml.xsl
+++ b/Logtalk/xml/lgthtml.xsl
@@ -15,7 +15,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
diff --git a/Logtalk/xml/lgtpdfa4.xsl b/Logtalk/xml/lgtpdfa4.xsl
index 7b08148b1..af0807211 100644
--- a/Logtalk/xml/lgtpdfa4.xsl
+++ b/Logtalk/xml/lgtpdfa4.xsl
@@ -9,7 +9,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
diff --git a/Logtalk/xml/lgtpdfus.xsl b/Logtalk/xml/lgtpdfus.xsl
index 1ad9f8fcc..969bf80b4 100644
--- a/Logtalk/xml/lgtpdfus.xsl
+++ b/Logtalk/xml/lgtpdfus.xsl
@@ -9,7 +9,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
diff --git a/Logtalk/xml/lgtxhtml.xsl b/Logtalk/xml/lgtxhtml.xsl
index 86d03b12f..9824f4ab4 100644
--- a/Logtalk/xml/lgtxhtml.xsl
+++ b/Logtalk/xml/lgtxhtml.xsl
@@ -15,7 +15,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
diff --git a/Logtalk/xml/lgtxml.xsl b/Logtalk/xml/lgtxml.xsl
index 828869c0e..7259c61de 100644
--- a/Logtalk/xml/lgtxml.xsl
+++ b/Logtalk/xml/lgtxml.xsl
@@ -15,7 +15,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
diff --git a/Logtalk/xml/logtalk.dtd b/Logtalk/xml/logtalk.dtd
index ee4ac68e9..ffc67ade1 100644
--- a/Logtalk/xml/logtalk.dtd
+++ b/Logtalk/xml/logtalk.dtd
@@ -3,7 +3,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
diff --git a/Logtalk/xml/logtalk.xsd b/Logtalk/xml/logtalk.xsd
index 43608ca1f..2787b5a90 100644
--- a/Logtalk/xml/logtalk.xsd
+++ b/Logtalk/xml/logtalk.xsd
@@ -15,7 +15,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
diff --git a/Logtalk/xml/texml.xsl b/Logtalk/xml/texml.xsl
index 2efffd7db..2905cf277 100644
--- a/Logtalk/xml/texml.xsl
+++ b/Logtalk/xml/texml.xsl
@@ -12,7 +12,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
diff --git a/library/logtalk/logtalk.pl b/library/logtalk/logtalk.pl
index 726921f6e..d2e0c3dd8 100644
--- a/library/logtalk/logtalk.pl
+++ b/library/logtalk/logtalk.pl
@@ -2,7 +2,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
@@ -155,6 +155,7 @@ Obj::Pred :-
 	'$lgt_sender'(Context, user),
 	'$lgt_this'(Context, user),
 	'$lgt_self'(Context, Obj),
+	'$lgt_metavars'(Context, []),
 	'$lgt_tr_msg'(Obj, Pred, Call, Context),
 	call(Call).
 
@@ -412,12 +413,10 @@ abolish_object(Obj) :-
 			'$lgt_once'(Prefix, Dcl, Def, Super, IDcl, IDef, DDcl, DDef),
 			forall(
 				'$lgt_call'(Def, _, _, _, _, Pred),
-				(functor(Pred, Functor, Arity),
-				 abolish(Functor/Arity))),
+				(functor(Pred, Functor, Arity), abolish(Functor/Arity))),
 			forall(
 				'$lgt_call'(DDef, _, _, _, _, Pred),
-				(functor(Pred, Functor, Arity),
-				 abolish(Functor/Arity))),
+				(functor(Pred, Functor, Arity), abolish(Functor/Arity))),
 			abolish(Dcl/4),
 			abolish(Dcl/6),
 			abolish(Def/5),
@@ -457,8 +456,7 @@ abolish_category(Ctg) :-
 			'$lgt_once'(Prefix, Dcl, Def),
 			forall(
 				'$lgt_call'(Def, _, _, _, _, Pred),
-				(functor(Pred, Functor, Arity),
-				 abolish(Functor/Arity))),
+				(functor(Pred, Functor, Arity), abolish(Functor/Arity))),
 			abolish(Dcl/4),
 			abolish(Dcl/5),
 			abolish(Def/5),
@@ -1076,7 +1074,7 @@ current_logtalk_flag(Flag, Value) :-
 	'$lgt_default_flag'(Flag, Value),
 	\+ '$lgt_flag_'(Flag, _).
 
-current_logtalk_flag(version, version(2, 16, 0)).
+current_logtalk_flag(version, version(2, 16, 1)).
 
 
 
@@ -2841,6 +2839,21 @@ user0__def(Pred, _, _, _, Pred, user).
 	throw(permission_error(define, dynamic_predicate, Functor/Arity)).
 
 
+% redefinition of Logtalk message sending and external call control constructs
+
+'$lgt_tr_head'(Term1::Term2, _, _) :-
+	throw(permission_error(modify, control_construct, Term1::Term2)).
+
+'$lgt_tr_head'(::Term, _, _) :-
+	throw(permission_error(modify, control_construct, ::Term)).
+
+'$lgt_tr_head'(^^Term, _, _) :-
+	throw(permission_error(modify, control_construct, ^^Term)).
+
+'$lgt_tr_head'({Term}, _, _) :-
+	throw(permission_error(modify, control_construct, {Term})).
+
+
 % redefinition of Logtalk built-in methods
 
 '$lgt_tr_head'(Head, _, _) :-
@@ -3077,9 +3090,13 @@ user0__def(Pred, _, _, _, Pred, user).
 	'$lgt_self'(Context, Self),
 	!.
 
-'$lgt_tr_body'(parameter(Arg, Value), true, Context) :-
+'$lgt_tr_body'(parameter(Arg, Value), TPred, Context) :-
 	'$lgt_this'(Context, This),
-	arg(Arg, This, Value),
+	(var(This) ->
+		TPred = arg(Arg, This, Value)
+		;
+		arg(Arg, This, Value),
+		TPred = true),
 	!.
 
 
@@ -5028,6 +5045,10 @@ user0__def(Pred, _, _, _, Pred, user).
 %
 % fix calls to redefined built-in predicates
 
+'$lgt_fix_redef_built_ins'(Pred, Pred) :-
+	var(Pred),
+	!.
+
 '$lgt_fix_redef_built_ins'((Head:-Body), (Head:-Fixed)) :-
 	!,
 	'$lgt_fix_redef_built_ins'(Body, Fixed).
@@ -5768,7 +5789,15 @@ user0__def(Pred, _, _, _, Pred, user).
 '$lgt_valid_metapred_term'(Pred) :-
 	nonvar(Pred),
 	Pred =.. [_| Args],
-	forall('$lgt_member'(Arg, Args), (nonvar(Arg), (Arg = (::); Arg = (*)))).
+	'$lgt_valid_metapred_term_args'(Args).
+
+
+'$lgt_valid_metapred_term_args'([]).
+
+'$lgt_valid_metapred_term_args'([Arg| Args]) :-
+	nonvar(Arg),
+	once((Arg = (::); Arg = (*))),
+	'$lgt_valid_metapred_term_args'(Args).
 
 
 
@@ -5777,10 +5806,17 @@ user0__def(Pred, _, _, _, Pred, user).
 '$lgt_valid_mode_term'(Pred) :-
 	nonvar(Pred),
 	Pred =.. [_| Args],
-	forall(
-		'$lgt_member'(Arg, Args),
-		(nonvar(Arg), functor(Arg, Functor, Arity), Arity =< 1,
-		 '$lgt_pred_arg_instantiation_mode'(Functor))).
+	'$lgt_valid_mode_term_args'(Args).
+
+
+'$lgt_valid_mode_term_args'([]).
+
+'$lgt_valid_mode_term_args'([Arg| Args]) :-
+	nonvar(Arg),
+	functor(Arg, Functor, Arity),
+	Arity =< 1,
+	'$lgt_pred_arg_instantiation_mode'(Functor),
+	'$lgt_valid_mode_term_args'(Args).
 
 
 
diff --git a/library/logtalk/yap430.config b/library/logtalk/yap430.config
index d96547048..db37eb1af 100644
--- a/library/logtalk/yap430.config
+++ b/library/logtalk/yap430.config
@@ -1,11 +1,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.16.0
+%  Release 2.16.1
 %
 %  configuration file for YAP Prolog 4.3.23 or later
 %
-%  last updated: February 27, 2004
+%  last updated: March 10, 2004
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -175,11 +175,17 @@ forall(Generate, Test) :-
 '$lgt_pl_metapredicate'(all(*, ::, *)).
 '$lgt_pl_metapredicate'(call_cleanup(::)).
 '$lgt_pl_metapredicate'(call_cleanup(::, ::)).
-'$lgt_pl_metapredicate'(call_residue(::,*)).
+'$lgt_pl_metapredicate'(call_residue(::, *)).
+'$lgt_pl_metapredicate'(if(::, ::, ::)).
 '$lgt_pl_metapredicate'(on_cleanup(::)).
-'$lgt_pl_metapredicate'(freeze(*,::)).
+'$lgt_pl_metapredicate'(freeze(*, ::)).
 '$lgt_pl_metapredicate'(time_out(::, *, *)).
-'$lgt_pl_metapredicate'(when(*,::)).
+'$lgt_pl_metapredicate'(when(*, ::)).
+
+'$lgt_pl_metapredicate'(thread_at_exit(::)).
+'$lgt_pl_metapredicate'(thread_create(::, *, *)).
+'$lgt_pl_metapredicate'(thread_signal(*, ::)).
+'$lgt_pl_metapredicate'(with_mutex(*, ::)).