diff --git a/jsdoc b/jsdoc
index dd161e05..d31d0072 100755
--- a/jsdoc
+++ b/jsdoc
@@ -23,5 +23,3 @@ else
     # normal mode should be quiet
     java -classpath ${BASEDIR}/lib/js.jar ${CMD} -modules ${BASEDIR}/node_modules -modules ${BASEDIR}/rhino_modules -modules ${BASEDIR} ${BASEDIR}/jsdoc.js --dirname=${BASEDIR} $@
 fi
-
-#java -classpath ${BASEDIR}/lib/js.jar ${CMD} -modules ${BASEDIR}/node_modules -modules ${BASEDIR}/rhino_modules -modules ${BASEDIR} ${BASEDIR}/jsdoc.js --dirname=${BASEDIR} $@
\ No newline at end of file
diff --git a/jsdoc.cmd b/jsdoc.cmd
index 0744b884..96db593b 100644
--- a/jsdoc.cmd
+++ b/jsdoc.cmd
@@ -10,14 +10,36 @@ SET _BASEPATH=%_BASEPATH:~0,-1%
 REM for whatever reason, Rhino requires module paths to be valid URIs
 SET _URLPATH=file:/%_BASEPATH%
 
+IF "%_URLPATH%"=="%_URLPATH: =%" GOTO NO_SPACES
 :ESCAPE_SPACE
 SET _TRAILING=%_URLPATH:* =%
 CALL SET _URLPATH=%%_URLPATH: %_TRAILING%=%%
 SET _URLPATH=%_URLPATH%%%20%_TRAILING%
 IF NOT "%_URLPATH%"=="%_URLPATH: =%" GOTO ESCAPE_SPACE
+:NO_SPACES
 
-java -classpath "%_BASEPATH%/lib/js.jar" org.mozilla.javascript.tools.shell.Main -modules "%_URLPATH%/node_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %* --dirname="%_BASEPATH%/
+IF [%1]==[--debug] (
+    ECHO Running Debug
+    SET CMD=org.mozilla.javascript.tools.debugger.Main -debug
 
-REM java -classpath "%_BASEPATH%/lib/js.jar" org.mozilla.javascript.tools.debugger.Main -debug -modules "%_URLPATH%/node_modules/" -modules "%_URLPATH%/rhino_modules/" -modules "%_URLPATH%/" "%_BASEPATH%/jsdoc.js" %* --dirname="%_BASEPATH%/
+    REM `SHIFT` doesn't affect %*
+    :COLLECT_ARGS
+    IF [%2]==[] GOTO LAST_ARG
+    SET ARGS=%ARGS% %2
+    SHIFT
+    GOTO COLLECT_ARGS
+) ELSE (
+    SET CMD=org.mozilla.javascript.tools.shell.Main
+    SET ARGS=%*
+)
+:LAST_ARG
+
+IF [%1]==[-T] (
+    ECHO Running Tests
+    java -classpath "%_BASEPATH%/lib/js.jar" %CMD% -opt -1 -modules "%_URLPATH%/node_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %ARGS% --dirname="%_BASEPATH%/
+) ELSE (
+    REM normal mode should be quiet
+    java -classpath "%_BASEPATH%/lib/js.jar" %CMD% -modules "%_URLPATH%/node_modules" -modules "%_URLPATH%/rhino_modules" -modules "%_URLPATH%" "%_BASEPATH%/jsdoc.js" %ARGS% --dirname="%_BASEPATH%/
+)
 
 ENDLOCAL
diff --git a/node_modules/wrench/wrench.js b/node_modules/wrench/wrench.js
index 592aa6fe..7cf90892 100644
--- a/node_modules/wrench/wrench.js
+++ b/node_modules/wrench/wrench.js
@@ -49,7 +49,7 @@ exports.readdirSyncRecursive = function(baseDir) {
 
     // convert absolute paths to relative
     var fileList = readdirSyncRecursive(baseDir).map(function(val){
-        return val.replace(baseDir + '/', '');
+        return val.replace(/\\/g, '/').replace(baseDir + '/', '');
     });
 
     return fileList;
diff --git a/test/jasmine-jsdoc.js b/test/jasmine-jsdoc.js
index 51213ca9..eac659c9 100644
--- a/test/jasmine-jsdoc.js
+++ b/test/jasmine-jsdoc.js
@@ -15,7 +15,7 @@ jasmine.loadHelpersInFolder = function(folder, matcher) {
     helpers = helperCollection.getSpecs();
     for ( var i = 0, len = helpers.length; i < len; ++i) {
         var file = helpers[i].path();
-        var helper = require(file.replace(/\.*$/, ""));
+        var helper = require(file.replace(/\\/g, '/').replace(new RegExp('^' + __dirname + '/'), "").replace(/\.*$/, ""));
 
         for (var key in helper) {
             this[key] = helper[key];
@@ -79,7 +79,7 @@ jasmine.executeSpecsInFolder = function(folder, done, verbose, matcher) {
     var specsList = specs.getSpecs();
     for ( var i = 0, len = specsList.length; i < len; ++i) {
         var filename = specsList[i];
-        require(filename.path().replace(/\.\w+$/, ""));
+        require(filename.path().replace(/\\/g, '/').replace(new RegExp('^' + __dirname + '/'), "").replace(/\.\w+$/, ""));
     }
 
     //Run Jasmine