Index: apps/comm/webserver.xotcl
===================================================================
diff -u -r46f02e4868e118466d888b35d6b281b3f2ba31ac -rdf9b12b3347ec6d0aaab6a080619734cd4c45f34
--- apps/comm/webserver.xotcl	(.../webserver.xotcl)	(revision 46f02e4868e118466d888b35d6b281b3f2ba31ac)
+++ apps/comm/webserver.xotcl	(.../webserver.xotcl)	(revision df9b12b3347ec6d0aaab6a080619734cd4c45f34)
@@ -4,7 +4,7 @@
 array set opts $argv
 lappend auto_path $opts(-pkgdir)
 #if {$::tcl_platform(platform) eq "windows"} {lappend auto_path .}
-package require XOTcl; namespace import -force xotcl::*
+package require XOTcl; xotcl::use xotcl1
 
 proc ! string {
   set f [open [::xotcl::tmpdir]/log w+]; 
Index: generic/predefined.h
===================================================================
diff -u -rba41800193462bb1c6673f4774b56c9829cc991a -rdf9b12b3347ec6d0aaab6a080619734cd4c45f34
--- generic/predefined.h	(.../predefined.h)	(revision ba41800193462bb1c6673f4774b56c9829cc991a)
+++ generic/predefined.h	(.../predefined.h)	(revision df9b12b3347ec6d0aaab6a080619734cd4c45f34)
@@ -576,7 +576,6 @@
 "switch -exact $version {\n"
 "xotcl1 {\n"
 "package require xotcl1\n"
-"puts stderr \"current=[namespace current], ul=[uplevel {namespace current}]\"\n"
 "if {$callingNs ne \"::xotcl\"} {uplevel {namespace import -force ::xotcl::*}}}\n"
 "default {\n"
 "if {$callingNs ne \"::xotcl\"} {uplevel {namespace import -force ::xotcl::*}}\n"
Index: generic/predefined.xotcl
===================================================================
diff -u -r2880a345930ceabfec83d491f26b8254099c8991 -rdf9b12b3347ec6d0aaab6a080619734cd4c45f34
--- generic/predefined.xotcl	(.../predefined.xotcl)	(revision 2880a345930ceabfec83d491f26b8254099c8991)
+++ generic/predefined.xotcl	(.../predefined.xotcl)	(revision df9b12b3347ec6d0aaab6a080619734cd4c45f34)
@@ -1113,7 +1113,7 @@
     switch -exact $version {
       xotcl1 {
 	package require xotcl1
-	puts stderr "current=[namespace current], ul=[uplevel {namespace current}]"
+	#puts stderr "current=[namespace current], ul=[uplevel {namespace current}]"
 	if {$callingNs ne "::xotcl"} {uplevel {namespace import -force ::xotcl::*}}
       }
       default {
Index: generic/xotclStack85.c
===================================================================
diff -u -rbfbe69299ca79f52f8571d5132864ad99f611180 -rdf9b12b3347ec6d0aaab6a080619734cd4c45f34
--- generic/xotclStack85.c	(.../xotclStack85.c)	(revision bfbe69299ca79f52f8571d5132864ad99f611180)
+++ generic/xotclStack85.c	(.../xotclStack85.c)	(revision df9b12b3347ec6d0aaab6a080619734cd4c45f34)
@@ -197,13 +197,14 @@
   return CallStackGetFrame(interp, framePtrPtr);
 }
 
+/* find last invocation of a scripted method */
 static XOTclCallStackContent *
 XOTclCallStackFindLastInvocation(Tcl_Interp *interp, int offset, Tcl_CallFrame **framePtrPtr) {
   register Tcl_CallFrame *varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp);
   int lvl = Tcl_CallFrame_level(varFramePtr);
-
+  
   for (; varFramePtr; varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr)) {
-    if (Tcl_CallFrame_isProcCallFrame(varFramePtr) & (FRAME_IS_XOTCL_METHOD|FRAME_IS_XOTCL_CMETHOD)) {
+    if (Tcl_CallFrame_isProcCallFrame(varFramePtr) & FRAME_IS_XOTCL_METHOD) {
       XOTclCallStackContent *cscPtr = (XOTclCallStackContent *)Tcl_CallFrame_clientData(varFramePtr);
       if ((cscPtr->callType & XOTCL_CSC_CALL_IS_NEXT) || (cscPtr->frameType & XOTCL_CSC_TYPE_INACTIVE)) {
         continue;
Index: library/comm/Connection.xotcl
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -rdf9b12b3347ec6d0aaab6a080619734cd4c45f34
--- library/comm/Connection.xotcl	(.../Connection.xotcl)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ library/comm/Connection.xotcl	(.../Connection.xotcl)	(revision df9b12b3347ec6d0aaab6a080619734cd4c45f34)
@@ -5,7 +5,7 @@
 package require XOTcl
 
 namespace eval ::xotcl::comm::connection {
-    namespace import ::xotcl::*
+    xotcl::use xotcl1
 
     Class Connection -parameter {host port req socket handle}
 
@@ -143,12 +143,13 @@
 	    ::puts stderr message=$msg
 	}
     }
+
     Connection instproc gets {var} {
 	#my showCall
 	upvar [self callinglevel] $var result
 	if {[catch {set n [::gets [my socket] result]} msg]} {
 	    my set error $msg 
-	    #my showMsg "CONNECTION error"
+            #my showMsg "CONNECTION error: $msg"
 	    return 0
 	}
 	#my showMsg "n=$n, result=<$result>"
Index: library/comm/Httpd.xotcl
===================================================================
diff -u -r46f02e4868e118466d888b35d6b281b3f2ba31ac -rdf9b12b3347ec6d0aaab6a080619734cd4c45f34
--- library/comm/Httpd.xotcl	(.../Httpd.xotcl)	(revision 46f02e4868e118466d888b35d6b281b3f2ba31ac)
+++ library/comm/Httpd.xotcl	(.../Httpd.xotcl)	(revision df9b12b3347ec6d0aaab6a080619734cd4c45f34)
@@ -17,7 +17,7 @@
 package require xotcl::comm::mime
 
 namespace eval ::xotcl::comm::httpd {
-  namespace import ::xotcl::*
+  xotcl::use xotcl1
 
   Class Httpd -parameter {
     {port 80} 
Index: library/comm/Mime.xotcl
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -rdf9b12b3347ec6d0aaab6a080619734cd4c45f34
--- library/comm/Mime.xotcl	(.../Mime.xotcl)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ library/comm/Mime.xotcl	(.../Mime.xotcl)	(revision df9b12b3347ec6d0aaab6a080619734cd4c45f34)
@@ -5,7 +5,7 @@
 package require XOTcl
 
 namespace eval ::xotcl::comm::mime {
-  namespace import ::xotcl::*
+  xotcl::use xotcl1
 
   #######################################################################
   Class MimeTypeLoader