diff --git a/custom/bin/buildsuper_x64-win.bat b/custom/bin/buildsuper_x64-win.bat
index 8ed77e52..8a9add9a 100644
--- a/custom/bin/buildsuper_x64-win.bat
+++ b/custom/bin/buildsuper_x64-win.bat
@@ -14,7 +14,7 @@ REM   5. cleanup after the metadata generator
 REM  All output files are generated in the current directory when the script is run
 
 set location=%cd%
-set me="%~dp0"
+set me=%~dp0
 cd %me%
 cd ..
 set custom_root=%cd%
@@ -36,21 +36,20 @@ if "%binname%" == "" set binname="custom_4coder"
 
 set opts=/W4 /wd4310 /wd4100 /wd4201 /wd4505 /wd4996 /wd4127 /wd4510 /wd4512 /wd4610 /wd4457 /WX
 set opts=%opts% /GR- /nologo /FC
-set opts=%opts% -I%custom_root%
+set opts=%opts% -I"%custom_root%"
 set opts=%opts% /D OS_WINDOWS=1 /D OS_LINUX=0 /D OS_MAC=0
 set opts=%opts% %mode%
 
 set preproc_file=4coder_command_metadata.i
-set meta_opts=/P /Fi%preproc_file% /DMETA_PASS
+set meta_opts=/P /Fi"%preproc_file%" /DMETA_PASS
 
 set build_dll=/LD /link /INCREMENTAL:NO /OPT:REF /RELEASE /PDBALTPATH:%%%%_PDB%%%%
 set build_dll=%build_dll% /EXPORT:get_version /EXPORT:init_apis
 
-call cl %opts% %meta_opts% %target%
+call cl %opts% %meta_opts% "%target%"
 call cl %opts% "%custom_root%\4coder_metadata_generator.cpp" /Femetadata_generator
 metadata_generator -R "%custom_root%" "%cd%\%preproc_file%"
-
-call cl %opts% %target% /Fe%binname% %build_dll%
+call cl %opts% "%target%" /Fe%binname% %build_dll%
 
 REM file spammation preventation
 del metadata_generator*
diff --git a/custom/bin/buildsuper_x86-win.bat b/custom/bin/buildsuper_x86-win.bat
index 6232b9f2..c8d156a6 100644
--- a/custom/bin/buildsuper_x86-win.bat
+++ b/custom/bin/buildsuper_x86-win.bat
@@ -14,7 +14,7 @@ REM   5. cleanup after the metadata generator
 REM  All output files are generated in the current directory when the script is run
 
 set location=%cd%
-set me="%~dp0"
+set me=%~dp0
 cd %me%
 cd ..
 set custom_root=%cd%
@@ -41,16 +41,15 @@ set opts=%opts% /D OS_WINDOWS=1 /D OS_LINUX=0 /D OS_MAC=0
 set opts=%opts% %mode%
 
 set preproc_file=4coder_command_metadata.i
-set meta_opts=/P /Fi%preproc_file% /DMETA_PASS
+set meta_opts=/P /Fi"%preproc_file%" /DMETA_PASS
 
 set build_dll=/LD /link /INCREMENTAL:NO /OPT:REF /RELEASE /PDBALTPATH:%%%%_PDB%%%%
 set build_dll=%build_dll% /EXPORT:get_version /EXPORT:init_apis
 
-call cl %opts% %meta_opts% %target%
+call cl %opts% %meta_opts% "%target%"
 call cl %opts% "%custom_root%\4coder_metadata_generator.cpp" /Femetadata_generator
 metadata_generator -R "%custom_root%" "%cd%\%preproc_file%"
-
-call cl %opts% %target% /Fecustom_4coder %build_dll%
+call cl %opts% "%target%" /Fecustom_4coder %build_dll%
 
 REM file spammation preventation
 del metadata_generator*
diff --git a/custom/bin/setup_cl_x64.bat b/custom/bin/setup_cl_x64.bat
index 0c30f7df..982de73c 100644
--- a/custom/bin/setup_cl_x64.bat
+++ b/custom/bin/setup_cl_x64.bat
@@ -5,5 +5,5 @@ where /q cl
 IF %ERRORLEVEL% == 0 (EXIT /b)
 
 SET SCRIPTS_PATH=%~dp0
-%SCRIPTS_PATH%\setup_cl_generic.bat amd64
+"%SCRIPTS_PATH%\setup_cl_generic.bat" amd64
 
diff --git a/custom/bin/setup_cl_x86.bat b/custom/bin/setup_cl_x86.bat
index 2831dbf2..3266985f 100644
--- a/custom/bin/setup_cl_x86.bat
+++ b/custom/bin/setup_cl_x86.bat
@@ -1,6 +1,6 @@
 @echo off
 
 SET SCRIPTS_PATH=%~dp0
-%SCRIPTS_PATH%\setup_cl_generic.bat amd64_x86
+"%SCRIPTS_PATH%\setup_cl_generic.bat" amd64_x86
 
 
diff --git a/custom/custom_4coder.dll b/custom/custom_4coder.dll
new file mode 100644
index 00000000..28e38a3c
Binary files /dev/null and b/custom/custom_4coder.dll differ
diff --git a/custom/custom_4coder.pdb b/custom/custom_4coder.pdb
new file mode 100644
index 00000000..66823d2a
Binary files /dev/null and b/custom/custom_4coder.pdb differ
diff --git a/custom/vc140.pdb b/custom/vc140.pdb
new file mode 100644
index 00000000..fb6249ab
Binary files /dev/null and b/custom/vc140.pdb differ