Index: library/nx/nx.tcl
===================================================================
diff -u -rd1ed482555d4d28dbb41fb9ca2723eabb5e01221 -re607595596399193900b411fa551280e7086963a
--- library/nx/nx.tcl	(.../nx.tcl)	(revision d1ed482555d4d28dbb41fb9ca2723eabb5e01221)
+++ library/nx/nx.tcl	(.../nx.tcl)	(revision e607595596399193900b411fa551280e7086963a)
@@ -11,7 +11,6 @@
   #
   # First create the ::nx object system. 
   #
-
   ::nsf::createobjectsystem ::nx::Object ::nx::Class {
     -class.alloc alloc 
     -class.create create
Index: library/pkgIndex.tcl
===================================================================
diff -u -rb06bfdbbe7b8efb3dbc58d90f5b7aa7d6d9fdef9 -re607595596399193900b411fa551280e7086963a
--- library/pkgIndex.tcl	(.../pkgIndex.tcl)	(revision b06bfdbbe7b8efb3dbc58d90f5b7aa7d6d9fdef9)
+++ library/pkgIndex.tcl	(.../pkgIndex.tcl)	(revision e607595596399193900b411fa551280e7086963a)
@@ -1,8 +1,7 @@
 set __dir__ $dir 
 foreach index [concat \
 		   [glob -nocomplain [file join $dir * pkgIndex.tcl]] \
-		   [glob -nocomplain [file join $dir * * pkgIndex.tcl]] \
-		   [glob -nocomplain [file join $dir * * * pkgIndex.tcl]]] {
+		   [glob -nocomplain [file join $dir * * pkgIndex.tcl]]] {
   set dir [file dirname $index]
   source $index
 } 
Index: library/xotcl/apps/comm/webserver.xotcl
===================================================================
diff -u -r76fadfb3f603f8f96a6064f4bb5342133923ec53 -re607595596399193900b411fa551280e7086963a
--- library/xotcl/apps/comm/webserver.xotcl	(.../webserver.xotcl)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
+++ library/xotcl/apps/comm/webserver.xotcl	(.../webserver.xotcl)	(revision e607595596399193900b411fa551280e7086963a)
@@ -1,10 +1,9 @@
-#!../../src/xotclsh
-# $Id: webserver.xotcl,v 1.6 2006/09/27 08:12:39 neumann Exp $
+#!/usr/bin/env tclsh
 array set opts {-root ../../doc -port 8086 -protected-port 9096 -pkgdir .}
 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 2.0; namespace import -force ::xotcl::*
 
 proc ! string {
   set f [open [::xotcl::tmpdir]/log w+];