diff --git a/duplicati_install_script/setup_duplicati.bat b/duplicati_install_script/setup_duplicati.bat
index 19c395c..47f6063 100644
--- a/duplicati_install_script/setup_duplicati.bat
+++ b/duplicati_install_script/setup_duplicati.bat
@@ -62,10 +62,10 @@ cls
     reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set OS=32Bit || set OS=64Bit
 
     if %OS%==64Bit (
-        reg query HKEY_CLASSES_ROOT\Installer\Dependencies\,,amd64,14.0,bundle  1>NUL || %~dp0bin\vc_redist.x64.exe /norestart
+        reg query HKEY_CLASSES_ROOT\Installer\Dependencies\,,amd64,14.0,bundle  1>NUL || "%~dp0bin\vc_redist.x64.exe" /norestart
     )
     if %OS%==32Bit (
-        reg query HKEY_CLASSES_ROOT\Installer\Dependencies\,,x86,14.0,bundle  1>NUL || %~dp0bin\vc_redist.x32.exe /norestart
+        reg query HKEY_CLASSES_ROOT\Installer\Dependencies\,,x86,14.0,bundle  1>NUL || "%~dp0bin\vc_redist.x32.exe" /norestart
     )
 
 :DUPLICATIINSTALL
@@ -73,7 +73,7 @@ cls
 	echo Installing duplicati binary...
 	echo Ensure that you deselect run at startup to ensure service works proper!
     echo Also! Ensure you do not run duplicati after install has completed!!
-    start /wait msiexec /i %~dp0bin\duplicati-2.0.3.11_canary_2018-09-05-x64.msi
+    start /wait msiexec /i "%~dp0bin\duplicati-2.0.3.11_canary_2018-09-05-x64.msi"
     goto GETPROGRAMPATH
 
 
@@ -133,7 +133,7 @@ SC queryex "%ServiceName%"|Find "STATE"|Find /v "RUNNING">Nul&&(
 	set FILEDATABASE="schedule-database-%CLIENTNAME%.json"
 	set FILEDOCUMENTS="schedule-documents-%CLIENTNAME%.json"
 
-	%~dp0bin\winscp.com /ini=nul /command ^
+	"%~dp0bin\winscp.com" /ini=nul /command ^
 	    "open sftp://mrdownloader@mydentalbackup.co.uk:5349/ -hostkey=""ssh-ed25519 256 PTL6imOWXdhJQEuBThd8yfozcuOtOxpKEZs0hOGZh3c="" -privatekey=""%~dp0bin\id_deployer2.ppk""" ^
 	    "cd /home/mydentalbackup.co.uk/files" ^
 	    "lcd %~dp0bin" ^
@@ -147,10 +147,10 @@ SC queryex "%ServiceName%"|Find "STATE"|Find /v "RUNNING">Nul&&(
 
 :ADDSCHEDULES
 
-	%~dp0bin\duplicati_client.exe login http://127.0.0.1:8200
-	%~dp0bin\duplicati_client.exe create backup %~dp0bin\schedule-database-%CLIENTNAME%.json
-	%~dp0bin\duplicati_client.exe create backup %~dp0bin\schedule-documents-%CLIENTNAME%.json
-	%~dp0bin\duplicati_client.exe create backup %~dp0bin\schedule-xrays-%CLIENTNAME%.json
+	"%~dp0bin\duplicati_client.exe" login http://127.0.0.1:8200
+	"%~dp0bin\duplicati_client.exe" create backup "%~dp0bin\schedule-database-%CLIENTNAME%.json"
+	"%~dp0bin\duplicati_client.exe" create backup "%~dp0bin\schedule-documents-%CLIENTNAME%.json"
+	"%~dp0bin\duplicati_client.exe" create backup "%~dp0bin\schedule-xrays-%CLIENTNAME%.json"
 
 goto SORTCHORTCUTS
 
@@ -162,7 +162,7 @@ goto SORTCHORTCUTS
     del "%USERPROFILE%\Desktop\Duplicati 2.lnk"
     echo.
     echo Adding new shortcut to desktop
-    xcopy "%~dp0bin\Duplicati 2 start.lnk" %USERPROFILE%\Desktop
+    xcopy "%~dp0bin\Duplicati 2 start.lnk" "%USERPROFILE%\Desktop"
 	
 
 :EXITNOW