diff --git a/SystemChecks/RegistryUpdates.bat b/SystemChecks/RegistryUpdates.bat
index 71bd50f..8536b2b 100644
--- a/SystemChecks/RegistryUpdates.bat
+++ b/SystemChecks/RegistryUpdates.bat
@@ -1,15 +1,17 @@
-@echo on
+@echo off
+call C:\Scripts\wBase\baseENV.bat
 call C:\Scripts\wLocal\localENV.bat
 @REM xxxxxxx
 echo "START: %~n0"
 
+@REM set powershell variables
 set SHOWSECONDS="%BASE%\PS\pShowSeconds.ps1"
 set SHOWAPPICONS="%BASE%\PS\pShowAppIcons.ps1"
-set EXE="Powershell.exe"
 
 echo "Installing AppIconsUpdate"
-%EXE% -ExecutionPolicy Bypass -File %SHOWAPPICONS%
+%POWERSHELL% -ExecutionPolicy Bypass -File %SHOWAPPICONS%
 
 echo "Installing SecondsUpdate"
-%EXE% -ExecutionPolicy Bypass -File %SHOWSECONDS%
+%POWERSHELL% -ExecutionPolicy Bypass -File %SHOWSECONDS%
 
+echo "FINISHED: %~n0"
diff --git a/SystemChecks/Win11Checks.bat b/SystemChecks/Win11Checks.bat
index 466fa43..f772708 100644
--- a/SystemChecks/Win11Checks.bat
+++ b/SystemChecks/Win11Checks.bat
@@ -1,34 +1,38 @@
 @echo off
+call C:\Scripts\wBase\baseENV.bat
+call C:\Scripts\wLocal\localENV.bat
+@REM xxxxxxx
+echo "START: %~n0"
 
 echo %COMPUTERNAME% | find /I "reception" >nul
 if %errorlevel%==0 (
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat LibreOffice "C:\Program Files\LibreOffice\program\soffice.exe"
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Securilog "C:\Isopharm\Securilog\Securilog.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat LibreOffice "C:\Program Files\LibreOffice\program\soffice.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat Securilog "C:\Isopharm\Securilog\Securilog.exe"
 
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Daryou "C:\Windows\twain_32\DY50TWAIN\transfer.exe"
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Exact "C:\Program Files (x86)\Software of Excellence\EXACT\Launch\SoeiDental.ExactLauncher.exe"
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat ExaminePro "C:\Program Files (x86)\SOE\ExPro\ExPro.exe"
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Kavo "C:\Program Files (x86)\PaloDEx Group\IAM\KaVoDriverDashboard.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat Daryou "C:\Windows\twain_32\DY50TWAIN\transfer.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat Exact "C:\Program Files (x86)\Software of Excellence\EXACT\Launch\SoeiDental.ExactLauncher.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat ExaminePro "C:\Program Files (x86)\SOE\ExPro\ExPro.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat Kavo "C:\Program Files (x86)\PaloDEx Group\IAM\KaVoDriverDashboard.exe"
 
-    C:\Scripts\wLocal\SystemChecks\AddPrinters.bat
+    %LOCAL%\SystemChecks\AddPrinters.bat
 )
 
 echo %COMPUTERNAME% | find /I "surgery" >nul
 if %errorlevel%==0 (
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Daryou "C:\Windows\twain_32\DY50TWAIN\transfer.exe"
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Exact "C:\Program Files (x86)\Software of Excellence\EXACT\Launch\SoeiDental.ExactLauncher.exe"
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat ExaminePro "C:\Program Files (x86)\SOE\ExPro\ExPro.exe"
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Kavo "C:\Program Files (x86)\PaloDEx Group\IAM\KaVoDriverDashboard.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat Daryou "C:\Windows\twain_32\DY50TWAIN\transfer.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat Exact "C:\Program Files (x86)\Software of Excellence\EXACT\Launch\SoeiDental.ExactLauncher.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat ExaminePro "C:\Program Files (x86)\SOE\ExPro\ExPro.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat Kavo "C:\Program Files (x86)\PaloDEx Group\IAM\KaVoDriverDashboard.exe"
 
-    C:\Scripts\wLocal\SystemChecks\AddPrinters.bat
+    %LOCAL%\SystemChecks\AddPrinters.bat
 
 )
 
 echo %COMPUTERNAME% | find /I "server" >nul
 if %errorlevel%==0 (
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat BackupAssist "C:\Program Files (x86)\BackupAssist v12\BackupAssist.exe"
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat Exact "C:\Program Files (x86)\Software of Excellence\EXACT Server\dental.exe"
-    C:\Scripts\wLocal\SystemChecks\CheckSoftware.bat SafeNet "C:\Program Files (x86)\SafeNet Sentinel\Sentinel Protection Installer\7.7.0\English\ReadMe.pdf"
+    %LOCAL%\SystemChecks\CheckSoftware.bat BackupAssist "C:\Program Files (x86)\BackupAssist v12\BackupAssist.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat Exact "C:\Program Files (x86)\Software of Excellence\EXACT Server\dental.exe"
+    %LOCAL%\SystemChecks\CheckSoftware.bat SafeNet "C:\Program Files (x86)\SafeNet Sentinel\Sentinel Protection Installer\7.7.0\English\ReadMe.pdf"
 )