diff --git a/bld.cmd b/bld.cmd
index 18a809c5b..00917e75b 100644
--- a/bld.cmd
+++ b/bld.cmd
@@ -4,9 +4,14 @@ rem build TiddlyWiki5 for five.tiddlywiki.com
 
 rem Set up the build output directory
 
-if "x%TW5_BUILD_OUTPUT%" == "x" (set TW5_BUILD_OUTPUT=..\jermolene.github.com)
+if "x%TW5_BUILD_OUTPUT%" == "x" (
+	set TW5_BUILD_OUTPUT=..\jermolene.github.com
+)
 
-if not exist %TW5_BUILD_OUTPUT%\nul echo A valid TW5_BUILD_OUTPUT environment variable must be set
+if not exist %TW5_BUILD_OUTPUT%\nul (
+	echo A valid TW5_BUILD_OUTPUT environment variable must be set
+	exit 1
+)
 
 echo Using TW5_BUILD_OUTPUT as %TW5_BUILD_OUTPUT%
 echo.
@@ -32,6 +37,7 @@ node .\tiddlywiki.js ^
 	--rendertiddler ReadMe .\readme.md text/html ^
 	--rendertiddler ContributingTemplate .\contributing.md text/html ^
 	--rendertiddler $:/core/save/all %TW5_BUILD_OUTPUT%\index.html text/plain ^
+	--rendertiddler $:/editions/tw5.com/save-empty %TW5_BUILD_OUTPUT%\empty2.html text/plain ^
 	--rendertiddler $:/core/templates/static.template.html %TW5_BUILD_OUTPUT%\static.html text/plain ^
 	--rendertiddler $:/core/templates/static.template.css %TW5_BUILD_OUTPUT%\static\static.css text/plain ^
 	--rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html %TW5_BUILD_OUTPUT%\static text/plain ^
diff --git a/deploy.cmd b/deploy.cmd
index 3edfdd82b..d1bf0cf5c 100644
--- a/deploy.cmd
+++ b/deploy.cmd
@@ -1,4 +1,4 @@
-@echo
+@echo off
 
 rem Publish to NPM
 
@@ -6,7 +6,7 @@ npm publish || exit 1
 
 rem Deploy latest build to github
 
-pushd ..\mytiddlywiki.github.com
+pushd ..\jermolene.github.com
 
 git add --all || exit 1
 
diff --git a/ginsu.cmd b/ginsu.cmd
index 8ccfefcd9..2b0221915 100644
--- a/ginsu.cmd
+++ b/ginsu.cmd
@@ -1,4 +1,4 @@
-@echo
+@echo off
 
 rem Split the tiddlers out of a TiddlyWiki file
 
diff --git a/test.cmd b/test.cmd
index 047230684..28dbcc376 100644
--- a/test.cmd
+++ b/test.cmd
@@ -4,9 +4,14 @@ rem test TiddlyWiki5 for five.tiddlywiki.com
 
 rem Set up the build output directory
 
-if "x%TW5_BUILD_OUTPUT%" == "x" (set TW5_BUILD_OUTPUT=%TMP%\mytiddlywiki.github.com)
+if "x%TW5_BUILD_OUTPUT%" == "x" (
+	set TW5_BUILD_OUTPUT=..\jermolene.github.com
+)
 
-if not exist %TW5_BUILD_OUTPUT%\nul echo A valid TW5_BUILD_OUTPUT environment variable must be set
+if not exist %TW5_BUILD_OUTPUT%\nul (
+	echo A valid TW5_BUILD_OUTPUT environment variable must be set
+	exit 1
+)
 
 echo Using TW5_BUILD_OUTPUT as %TW5_BUILD_OUTPUT%
 
diff --git a/verbump.cmd b/verbump.cmd
index 8457419ea..657decac8 100644
--- a/verbump.cmd
+++ b/verbump.cmd
@@ -1,8 +1,11 @@
-@echo
+@echo off
 
 rem Bump to a new version number
 
-if "x%1" == "x" echo "Missing version (eg '5.0.0-alpha.99')" && exit 1
+if "x%1" == "x" (
+	echo Missing version (eg '5.0.0-alpha.99'^)
+	exit 1
+)
 
 rem Set the new version number (will also commit and tag the release)
 
diff --git a/wbld.cmd b/wbld.cmd
index 26dead28d..33fc1ee37 100644
--- a/wbld.cmd
+++ b/wbld.cmd
@@ -1,4 +1,4 @@
-@echo
+@echo off
 
 rem build the TiddlyWeb edition of TiddlyWiki5 and upload it to TiddlySpace. Requires the TiddlySpace credentials
 rem of a member of the tw5tiddlyweb space