diff --git a/wimscripts/copy-iso.cmd b/wimscripts/copy-iso.cmd
index 2b6e9ea..dbe086e 100644
--- a/wimscripts/copy-iso.cmd
+++ b/wimscripts/copy-iso.cmd
@@ -1,7 +1,9 @@
-rd /S /Q c:\TEMP\Win10
-mkdir c:\TEMP\Win10 1>nul 2>nul
+set W10="c:\TEMP\Win10"
 
-powershell Mount-DiskImage -ImagePath "C:\TEMP\Win10.iso"
-xcopy /CDI /HERBY D:\* c:\TEMP\Win10
-powershell Dismount-Diskimage -ImagePath "C:\TEMP\Win10.iso"
+rd /S /Q %W10%
+mkdir %W10% 1>nul 2>nul
+
+powershell Mount-DiskImage -ImagePath %W10%.iso
+robocopy \\.\CDROM0 %W10% /MIR /256
+powershell Dismount-Diskimage -ImagePath %W10%.iso
 
diff --git a/wimscripts/download-iso.cmd b/wimscripts/download-iso.cmd
index a1db7eb..fb6f92e 100644
--- a/wimscripts/download-iso.cmd
+++ b/wimscripts/download-iso.cmd
@@ -1,4 +1,7 @@
-del c:\TEMP\Win10*.iso
-ftp -i -s:download-iso.ftp
-move c:\TEMP\Win10*.iso c:\TEMP\Win10.iso
+set ISOGLOB=c:\TEMP\Win10*.iso
+set ISO=c:\TEMP\Win10.iso
+
+del %ISOGLOB%
+ftp -i -s:download-iso.ftp
+move %ISOGLOB% %ISO%
 
diff --git a/wimscripts/export-image.cmd b/wimscripts/export-image.cmd
index f980e4c..8023dab 100644
--- a/wimscripts/export-image.cmd
+++ b/wimscripts/export-image.cmd
@@ -1,8 +1,11 @@
-del c:\TEMP\install.wim
+set SOURCES="c:\TEMP\Win10\sources"
+
+del %SOURCES%\install.wim
+
 dism /Export-Image ^
-  /SourceImageFile:c:\TEMP\Win10\sources\install.esd ^
+  /SourceImageFile:%SOURCES%\install.esd ^
   /SourceIndex:6 ^
-  /DestinationImageFile:c:\TEMP\install.wim ^
+  /DestinationImageFile:%SOURCES%\install.wim ^
   /Compress:Max ^
   /CheckIntegrity