diff --git a/EXtenv.bat b/EXtenv.bat
deleted file mode 100644
index 76529a9..0000000
--- a/EXtenv.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-set DUFUS="1816161258:AAGNRS1t_ApXwAm0jJyms5H6H7BaJFPvyok"
-set TCHATID="1462463122"
diff --git a/EXnenv.bat b/Msg/EXnenv.bat
similarity index 100%
rename from EXnenv.bat
rename to Msg/EXnenv.bat
diff --git a/EXnenvH.bat b/Msg/EXnenvH.bat
similarity index 100%
rename from EXnenvH.bat
rename to Msg/EXnenvH.bat
diff --git a/nmsg.bat b/Msg/nmsg.bat
similarity index 100%
rename from nmsg.bat
rename to Msg/nmsg.bat
diff --git a/nmsgH.bat b/Msg/nmsgH.bat
similarity index 100%
rename from nmsgH.bat
rename to Msg/nmsgH.bat
diff --git a/tmessage.bat b/Msg/tmessage.bat
similarity index 69%
rename from tmessage.bat
rename to Msg/tmessage.bat
index 3df85a2..29d7b40 100644
--- a/tmessage.bat
+++ b/Msg/tmessage.bat
@@ -1,10 +1,9 @@
 @echo off
-
 call C:\Scripts\wBase\baseENV.bat
 @REM xxxxxxx
 
 
 set STRING='%~1%'
 
-call %BASE%\nmsg.bat %STRING%
+call %BASE%\Msg\nmsg.bat %STRING%
 
diff --git a/tmessageH.bat b/Msg/tmessageH.bat
similarity index 69%
rename from tmessageH.bat
rename to Msg/tmessageH.bat
index 875702b..ae77dc8 100644
--- a/tmessageH.bat
+++ b/Msg/tmessageH.bat
@@ -1,10 +1,9 @@
 @echo off
-
 call C:\Scripts\wBase\baseENV.bat
 @REM xxxxxxx
 
 
 set STRING='%~1%'
 
-call %BASE%\nmsgH.bat %STRING%
+call %BASE%\Msg\nmsgH.bat %STRING%
 
diff --git a/baseENV.bat b/baseENV.bat
index afdf047..46802d3 100644
--- a/baseENV.bat
+++ b/baseENV.bat
@@ -5,6 +5,8 @@ echo "Found computer %check_computername%"
 set PACKAGES="C:\Packages"
 set WPUBLIC="C:\wPublic"
 
-set BASE=C:\Scripts\wBase
-set LOCAL=C:\Scripts\wLocal
-set TMESSAGE=%BASE%\tmessage.bat
+set BASE="C:\Scripts\wBase"
+set LOCAL="C:\Scripts\wLocal"
+set TMESSAGE="%BASE%\Msg\tmessage.bat"
+set TMESSAGEH="%BASE%\Msg\tmessageH.bat"
+set POWERSHELL="%SYSTEMROOT%\system32\WindowsPowerShell\v1.0\powershell.exe"
diff --git a/baseFixTime.bat b/baseFixTime.bat
index d3b3f2e..ac6f11c 100644
--- a/baseFixTime.bat
+++ b/baseFixTime.bat
@@ -1,7 +1,7 @@
 @echo off
-
-set C:\Scripts\wBase\baseENV.bat
+call C:\Scripts\wBase\baseENV.bat
 @REM xxxxxxx
+echo "%~n0: Start"
 
 echo "base_Logon: FIXTIME"
 
diff --git a/baseShutdown.bat b/baseShutdown.bat
index 4bf9213..eb05dd1 100644
--- a/baseShutdown.bat
+++ b/baseShutdown.bat
@@ -1,13 +1,16 @@
 @echo off
-
-set C:\Scripts\wBase\baseENV.bat
+call C:\Scripts\wBase\baseENV.bat
 @REM xxxxxxx
-
+echo "%~n0: Start"
 
 if "%check_computername%" EQU "SERVER" (
-  echo " NOT shutting down server "
+  set SHUTDOWN=0
+)
+
+if [%SHUTDOWN%] == [0] (
+  echo "Not shutting down"
 ) else (
-  echo "echo "shutting down""
+  echo "shutting down"
   call %TMESSAGE% '"%check_computername% shutting down"'
   C:\Windows\System32\shutdown.exe /s /t 1
 )
diff --git a/base_Logon.bat b/base_Logon.bat
index 915777a..e743715 100644
--- a/base_Logon.bat
+++ b/base_Logon.bat
@@ -1,12 +1,10 @@
 @echo off
-
-set C:\Scripts\wBase\baseENV.bat
+call C:\Scripts\wBase\baseENV.bat
 @REM xxxxxxx
+echo "%~n0: Start"
 
 set LOCAL_LOGON=%LOCAL%\local_Logon.bat
 
-echo "base_Logon: Started"
-
 FOR %%x IN (%BASE%\b_*.bat) DO (
     echo "%%x"
     call "%%x"
diff --git a/base_Onboot.bat b/base_Onboot.bat
index bc72906..af5ce0d 100644
--- a/base_Onboot.bat
+++ b/base_Onboot.bat
@@ -1,7 +1,7 @@
 @echo off
-
-set C:\Scripts\wBase\baseENV.bat
+call C:\Scripts\wBase\baseENV.bat
 @REM xxxxxxx
+echo "%~n0: Start"
 
 set LOCAL_ONBOOT=%LOCAL%\local_Onboot.bat