diff --git a/01_DownloadAll.cmd b/01_DownloadAll.cmd
index 2cbfccd..9eb71e3 100644
--- a/01_DownloadAll.cmd
+++ b/01_DownloadAll.cmd
@@ -9,12 +9,9 @@ if NOT EXIST software (
   cd software
 )
 
-clear
 echo ================================================
 echo START download of software from SOURCE sites ... 
 echo ================================================
-date /t
-time /t
 echo.
 
 rem start downloads ...
@@ -39,31 +36,7 @@ echo.
 rem go back ...
 cd ..
 
-rem check for apps directory ...
-if NOT EXIST apps (
-  echo ERROR: directory [ apps ] NOT FOUND!
-  echo ABORT.
-  exit /b
-) else (
-  cd apps
-)
-
-echo ================================================
-echo START download of APPS from SOURCE sites ... 
-echo ================================================
-date /t
-time /t
 echo.
-
-call download-apps-from-source.cmd
-echo.
-
-rem go back ...
-cd ..
-
-echo.
-date /t
-time /t
 echo ======
 echo READY.
 echo ======
diff --git a/02_ExtractIso.cmd b/02_ExtractIso.cmd
index 2c93541..e5d5a09 100644
--- a/02_ExtractIso.cmd
+++ b/02_ExtractIso.cmd
@@ -8,6 +8,7 @@ IF %1.==. GOTO USAGE
 echo ====================
 echo Extract ISO file ...
 echo ====================
+echo.
 
 rem get fullpath of isofile ...
 set ISOFILE=%~f1
@@ -38,9 +39,11 @@ powershell Dismount-Diskimage -ImagePath %ISOFILE%
 echo READY.
 echo.
 
-rem =====
-rem END
-rem =====
+echo.
+echo ======
+echo READY.
+echo ======
+
 GOTO END
 
 :USAGE
diff --git a/03_MakeBoot.cmd b/03_MakeBoot.cmd
index 24a5062..d5431ad 100644
--- a/03_MakeBoot.cmd
+++ b/03_MakeBoot.cmd
@@ -9,12 +9,9 @@ if NOT EXIST image (
   cd image
 )
 
-clear
 echo =========================================
 echo START of BOOT image creation process ... 
 echo =========================================
-date /t
-time /t
 echo.
 
 rem start scripts
@@ -35,8 +32,6 @@ rem go back ...
 cd ..
 
 echo.
-date /t
-time /t
 echo ======
 echo READY.
 echo ======
diff --git a/04_PrepareImage.cmd b/04_PrepareImage.cmd
index d61a2fd..66d6df1 100644
--- a/04_PrepareImage.cmd
+++ b/04_PrepareImage.cmd
@@ -9,12 +9,9 @@ if NOT EXIST image (
   cd image
 )
 
-clear
-echo =========================================
+echo ===================================
 echo START of MAIN image preparation ... 
-echo =========================================
-date /t
-time /t
+echo ===================================
 echo.
 
 rem start scripts
@@ -31,23 +28,20 @@ for %%S in (
 
 )
 
-rem go back ...
-cd ..
-
 echo checking for NTLite ...
 if NOT EXIST %NTLITE% (
   echo.
   echo ERROR: program [ NTLite ] NOT FOUND!
-  exit /b
 ) else (
   echo calling NTLite ...
   rem stupid windows: the "" are needed or NTlite will not be started - sigh -
   start /B "" %NTLITE%
 )
 
+rem go back ...
+cd ..
+
 echo.
-date /t
-time /t
 echo ======
 echo READY.
 echo ======
diff --git a/05_FinishImage.cmd b/05_FinishImage.cmd
index 32a9250..be07257 100644
--- a/05_FinishImage.cmd
+++ b/05_FinishImage.cmd
@@ -9,12 +9,9 @@ if NOT EXIST image (
   cd image
 )
 
-clear
-echo =========================================
+echo =================================
 echo END of MAIN image preparation ... 
-echo =========================================
-date /t
-time /t
+echo =================================
 echo.
 
 rem start scripts
@@ -35,8 +32,6 @@ rem go back ...
 cd ..
 
 echo.
-date /t
-time /t
 echo ======
 echo READY.
 echo ======
diff --git a/06_FormatStick.cmd b/06_FormatStick.cmd
index 4b8095c..0e82c71 100644
--- a/06_FormatStick.cmd
+++ b/06_FormatStick.cmd
@@ -8,8 +8,8 @@ mkdir %T% 1>nul 2>nul
 echo ====================
 echo Format USB Stick ...
 echo ====================
-
 echo.
+
 echo Showing disk list ...
 > %DPARTSCRIPT% (
     @echo.list disk
@@ -122,13 +122,12 @@ if %ERRORLEVEL% NEQ 0 (
   del /F %DPARTSCRIPT% 1>nul 2>nul
   exit /b
 )
-echo READY. 
 echo USB stick formatted.
-echo.
 
 rem cleanup ...
 del /F %DPARTSCRIPT% 1>nul 2>nul
 
-rem =====
-rem END
-rem =====
+echo.
+echo ======
+echo READY.
+echo ======
diff --git a/08_CopyWIM2Stick.cmd b/07_Copy2Stick.cmd
similarity index 84%
rename from 08_CopyWIM2Stick.cmd
rename to 07_Copy2Stick.cmd
index 6fdcd90..e6ad5cc 100644
--- a/08_CopyWIM2Stick.cmd
+++ b/07_Copy2Stick.cmd
@@ -1,5 +1,6 @@
 @echo off
-set SOURCES=c:\TEMP\W10\sources
+set W10=c:\TEMP\W10
+set SOURCES=%W10%\sources
 set BOOT=boot.wim
 set IMAGE=install.wim
 set SCRIPT_SETTINGS=scripts\settings.cmd
@@ -31,9 +32,10 @@ if NOT EXIST %COMPANY_SETTINGS% (
 )
 
 echo.
-echo =====================
-echo Prepare USB Stick ...
-echo =====================
+echo =================================
+echo Copying all data to USB Stick ...
+echo =================================
+echo.
 
 set USBDRIVE=%1
 
@@ -106,24 +108,19 @@ tools\searchreplace %USBDRIVE%\autounattend.xml ___MYNAME___ "%MYNAME%"
 tools\searchreplace %USBDRIVE%\autounattend.xml ___MYPASS___ "%MYPASS%"
 tools\searchreplace %USBDRIVE%\autounattend.xml ___MYLANG___ "%LANG%"
 
-if EXIST %SOURCES%\%BOOT% (
-  echo.
-  echo copying [ %BOOT% ] to drive %USBDRIVE% ...
-  robocopy %SOURCES% %USBDRIVE%\sources %BOOT% /J /NJH
-) else (
+if NOT EXIST %SOURCES%\%BOOT% (
   echo DOH! no %BOOT% in [ %SOURCES% ] found
   exit /b
 )
 
-if EXIST %SOURCES%\%IMAGE% (
-  echo.
-  echo copying [ %IMAGE% ] to drive %USBDRIVE% ...
-  robocopy %SOURCES% %USBDRIVE%\sources %IMAGE% /J /NJH
-) else (
+if NOT EXIST %SOURCES%\%IMAGE% (
   echo DOH! no %IMAGE% in [ %SOURCES% ] found
   exit /b
 )
 
+echo copying all files in [ %W10% ] to drive %USBDRIVE% ...
+robocopy %W10%\ %USBDRIVE% /MIR /256 /NDL /R:10 /J /XX
+
 :CONT
 if EXIST tools (
   echo.
@@ -160,12 +157,11 @@ echo.
 echo putting tools-copy script to %USBDRIVE% ...
 copy /Y image\CopyTools.cmd %USBDRIVE%\
 
-echo READY.
 echo.
+echo ======
+echo READY.
+echo ======
 
-rem =====
-rem END
-rem =====
 GOTO END
 
 :USAGE
diff --git a/07_PrepareStick.cmd b/07_PrepareStick.cmd
deleted file mode 100644
index 620be09..0000000
--- a/07_PrepareStick.cmd
+++ /dev/null
@@ -1,67 +0,0 @@
-@echo off
-set COPY_IMAGE=null
-set ISODRIVE=Y:
-
-IF %1.==. GOTO USAGE
-IF %2.==. GOTO USAGE
-IF "%~3" NEQ "" set COPY_IMAGE=%3
-
-echo.
-echo ====================
-echo Create USB Stick ...
-echo ====================
-
-rem get fullpath of isofile ...
-set USBDRIVE=%1
-set ISOFILE=%~f2
-
-if NOT EXIST %ISOFILE% (
-  echo ERROR: file %ISOFILE% not found!
-  exit /b
-)
-
-if /I %USBDRIVE% == C: (
-  echo ERROR: cannot use drive %USBDRIVE% !
-  exit /b
-)
-
-if NOT EXIST %USBDRIVE% (
-  echo ERROR: drive %USBDRIVE% not found!
-  exit /b
-)
-
-rem =====
-rem MAIN
-rem =====
-
-echo using drive %USBDRIVE% ...
-echo using image %ISOFILE% ...
-
-echo mounting disk image (iso) with powershell ...
-powershell "$diskImg = Mount-DiskImage -ImagePath %ISOFILE% -NoDriveLetter; $volInfo = $diskImg | Get-Volume; mountvol %ISODRIVE% $volInfo.UniqueId"
-
-if /I %COPY_IMAGE% == /W (
-  echo copying ALL files including wim from ISO to targetpath %USBDRIVE% ...
-  robocopy %ISODRIVE%\ %USBDRIVE% /MIR /256 /NFL /NDL /R:10
-) else (
-  echo copying files from ISO WITHOUT wim to targetpath %USBDRIVE% ...
-  robocopy %ISODRIVE%\ %USBDRIVE% /MIR /256 /NFL /NDL /R:10 /XF *.wim
-)
-
-echo unmounting disk image (iso) ...
-powershell Dismount-Diskimage -ImagePath %ISOFILE%
-
-echo READY.
-echo.
-
-rem =====
-rem END
-rem =====
-GOTO END
-
-:USAGE
-echo "usage: %0 <USBDRIVE> <ISOFILE> [/w]"
-echo   /w = copy windows images to target
-echo.
-:END
-
diff --git a/09_MakeISOfromStick.cmd b/08_MakeISOfromStick.cmd
similarity index 80%
rename from 09_MakeISOfromStick.cmd
rename to 08_MakeISOfromStick.cmd
index 2b9e765..1a02026 100644
--- a/09_MakeISOfromStick.cmd
+++ b/08_MakeISOfromStick.cmd
@@ -5,9 +5,9 @@ set ISOFILE=c:\temp\%OSLABEL%.iso
 
 IF %1.==. GOTO USAGE
 
-echo ===================
-echo Make ISO file ...
-echo ===================
+echo ================================
+echo Make ISO file from USB stick...
+echo ================================
 echo.
 
 set USBDRIVE=%1
@@ -38,12 +38,11 @@ if EXIST %ISOFILE% (
 
 %OSCDPATH%\oscdimg -l%OSLABEL% -m -u2 -b%OSCDPATH%\etfsboot.com %USBDRIVE%\ %ISOFILE%
 
-echo READY.
 echo.
+echo ======
+echo READY.
+echo ======
 
-rem =====
-rem END
-rem =====
 GOTO END
 
 :USAGE
diff --git a/apps/download-apps-from-source.cmd b/apps/download-apps-from-source.cmd
index 4240326..46703ed 100644
--- a/apps/download-apps-from-source.cmd
+++ b/apps/download-apps-from-source.cmd
@@ -11,9 +11,12 @@ IF NOT EXIST %LISTFILE% (
 echo using list [ %LISTFILE% ] ...
 mkdir %APPSFOLDER% 2>nul
 
-rem ###################################
-rem MAIN loop ( download all apps ) ...
-rem ###################################
+echo ================================================
+echo START download of APPS from SOURCE sites ... 
+echo ================================================
+date /t
+time /t
+echo.
 
 FOR /F "tokens=1" %%E in (%LISTFILE%) do (
   echo URL = [ %%E ]
@@ -28,3 +31,10 @@ del /F /Q %APPSFOLDER%\*arm*
 del /F /Q %APPSFOLDER%\*.eappxbundle
 del /F /Q %APPSFOLDER%\*.emsixbundle
 
+echo.
+date /t
+time /t
+echo ======
+echo READY.
+echo ======
+