diff --git a/bin/validateStoneSysNodes.stone b/bin/validateStoneSysNodes.stone
index 1ce08829..8fce9eae 100755
--- a/bin/validateStoneSysNodes.stone
+++ b/bin/validateStoneSysNodes.stone
@@ -97,7 +97,7 @@ doit
 							(ServerFileDirectory on:  self todeHome, templateNodePath , nodename) exists
 								ifFalse: [  templateNodePath := '/sys/default/server/templates/' ].
 	            cpTool
-	              cp: templateNodePath , nodename
+	              cp: templateNodePath , filename
 	              to: '/sys/stones/' , self stoneName ]
 	          ifFalse: [ 
 	            nil
diff --git a/src/GsDevKit_stones-Tode.package/TDShell.class/instance/executeMountCommand.batchMode..st b/src/GsDevKit_stones-Tode.package/TDShell.class/instance/executeMountCommand.batchMode..st
index 80733073..04dbac8b 100644
--- a/src/GsDevKit_stones-Tode.package/TDShell.class/instance/executeMountCommand.batchMode..st
+++ b/src/GsDevKit_stones-Tode.package/TDShell.class/instance/executeMountCommand.batchMode..st
@@ -2,20 +2,20 @@ mount command
 executeMountCommand: command batchMode: aBool
 	"only one of --todeRoot of --serverRoot may be present"
 
-	| index option commandLine todeRoot serverRoot rest |
+	| index option commandLine todeRoot stoneRoot rest |
 	commandLine := command commandLine copy.
 	todeRoot := '--todeRoot'.
-	serverRoot := '--serverRoot'.
+	stoneRoot := '--stoneRoot'.
 	(index := commandLine findString: todeRoot startingAt: 1) > 0
 		ifTrue: [ option := todeRoot ]
 		ifFalse: [ 
-			(index := commandLine findString: serverRoot startingAt: 1) > 0
-				ifTrue: [ option := serverRoot ] ].
+			(index := commandLine findString: stoneRoot startingAt: 1) > 0
+				ifTrue: [ option := stoneRoot ] ].
 	index > 0
 		ifTrue: [ 
 			| newCommandLine commandStream skipDone optionPath |
-			"--todeRoot and --serverRoot options for mount command use a call back, so hard-wire 
-				todeRoot/serverRoot path into the command and remove --todeRoot/--serverRoot 
+			"--todeRoot and --stoneRoot options for mount command use a call back, so hard-wire 
+				todeRoot/stoneRoot path into the command and remove --todeRoot/--stoneRoot 
 				option from commandLine"
 			newCommandLine := (commandLine copyFrom: 1 to: index - 1)
 				, (commandLine copyFrom: index + option size to: commandLine size).
@@ -29,8 +29,8 @@ executeMountCommand: command batchMode: aBool
 				ifTrue: [ self sessionDescription serverTodeRoot ]
 				ifFalse: [ 
 					"fabricate the --stoneRoot path for the stone associated with session description"
-					self sessionDescription serverTodeRoot.
-					'/' , '/sys/stones/' , self sessionDescription stoneName ].
+					self sessionDescription serverTodeRoot , '/sys/stones/'
+						, self sessionDescription stoneName ].
 			newCommandLine := 'mount ' , optionPath.
 			commandStream peek = $/
 				ifFalse: [ 
diff --git a/tode/setUpSys_1 b/tode/setUpSys_1
index 162f7129..a1074c83 100644
--- a/tode/setUpSys_1
+++ b/tode/setUpSys_1
@@ -1,7 +1,6 @@
-# Set up /sys node structure
 mount --todeRoot / / _home
 mount --todeRoot sys/default /sys default
 mount --todeRoot sys/local /sys local
 mount --todeRoot sys/local/server/stones /sys stones
-# /sys/default/bin/validateStoneSysNodes --files --repair
-
+mount --stoneRoot / /sys stone
+commit
diff --git a/tode/setUpSys_2 b/tode/setUpSys_2
index 7db6de9c..a99e68f0 100644
--- a/tode/setUpSys_2
+++ b/tode/setUpSys_2
@@ -1,7 +1,3 @@
-# /sys/default/bin/validateStoneSysNodes --files --repair
-mount --stoneRoot / /sys stone
-# Define /home and /projects based on a composition of the /sys nodes
 mount --stoneRoot homeComposition.ston / home
 mount --stoneRoot projectComposition.ston / projects
 commit
-cd