diff --git a/bin/autoupdate.bat b/bin/autoupdate.bat
index 14a7f8c..e9d64b9 100644
--- a/bin/autoupdate.bat
+++ b/bin/autoupdate.bat
@@ -7,7 +7,7 @@ REM -------------------------------------------------------------------
 REM
 REM                        autoupdate.bat
 REM
-REM Automatic RDP Wrapper installer and updater // asmtron (16-08-2019)
+REM Automatic RDP Wrapper installer and updater // asmtron (07-09-2019)
 REM -------------------------------------------------------------------
 REM Options:
 REM   -log        = redirect display output to the file autoupdate.log
@@ -223,12 +223,10 @@ if exist %rdpwrap_new_ini% (
         for /f "usebackq delims=" %%a in (
             `findstr /n "^" %rdpwrap_new_ini%`
         ) do (
-            set "line=!%%a!"
-            set "line=!line:*:=!"
-            if "!line!"=="*:=" (
+            if "!%%a!"=="" (
                 echo.
             ) else (
-                echo !line!
+                echo !%%a!
             )
         )
     )>%rdpwrap_ini%
diff --git a/bin/helper/autoupdate__info.txt b/bin/helper/autoupdate__info.txt
index 89fb009..bb9f62b 100644
--- a/bin/helper/autoupdate__info.txt
+++ b/bin/helper/autoupdate__info.txt
@@ -2,7 +2,7 @@
 
                         autoupdate.bat
 
- Automatic RDP Wrapper installer and updater // asmtron (16-08-2019)
+ Automatic RDP Wrapper installer and updater // asmtron (07-09-2019)
  -------------------------------------------------------------------
  Options:
    -log        = redirect display output to the file autoupdate.log
@@ -31,7 +31,7 @@
     USE ONLY the "%ProgramFiles%\RDP Wrapper" directory (normally C:\Program Files\RDP Wrapper)
 
 
- 2. Copy the files/folder from the archive "autoupdate-v16.08.2019.zip" (or newer) to the "%ProgramFiles%\RDP Wrapper" directory
+ 2. Copy the files/folder from the archive "autoupdate-v07.09.2019.zip" (or newer) to the "%ProgramFiles%\RDP Wrapper" directory
 
 
  3. To enable autorun of autoupdate.bat on system startup, run the folling helper batch file as administrator:
@@ -42,6 +42,6 @@
  4. Set in your Antivirus/WindowsDefnder an exclusion on the folder "%ProgramFiles%\RDP Wrapper" to prevent the deletion of RDP Wrapper files
 
 
- 5. Now you can use the autoupdate batch file to install and update the RDP Wrapper. Please run the folling autoupdate batch file as administrator:
+ 5. Now you can use the autoupdate batch file to install and update the RDP Wrapper. Please run autoupdate.bat as administrator:
 
    "%ProgramFiles%\RDP Wrapper\autoupdate.bat"
diff --git a/res/rdpwrap.ini b/res/rdpwrap.ini
index 4434d92..17c7dca 100644
--- a/res/rdpwrap.ini
+++ b/res/rdpwrap.ini
@@ -2,7 +2,7 @@
 ; Do not modify without special knowledge
 
 [Main]
-Updated=2019-08-22
+Updated=2019-09-02
 LogFile=\rdpwrap.txt
 SLPolicyHookNT60=1
 SLPolicyHookNT61=1
@@ -3524,24 +3524,28 @@ SLInitOffset.x64=1ABFC
 SLInitFunc.x64=New_CSLQuery_Initialize
 
 [10.0.17763.288]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
 LocalOnlyPatch.x86=1
 LocalOnlyOffset.x86=AFAD4
 LocalOnlyCode.x86=jmpshort
 LocalOnlyPatch.x64=1
 LocalOnlyOffset.x64=77A11
 LocalOnlyCode.x64=jmpshort
+; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
 SingleUserPatch.x86=1
 SingleUserOffset.x86=4D665
 SingleUserCode.x86=nop
 SingleUserPatch.x64=1
 SingleUserOffset.x64=1322C
 SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
 DefPolicyPatch.x86=1
 DefPolicyOffset.x86=4BE69
 DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
 DefPolicyPatch.x64=1
 DefPolicyOffset.x64=17F45
 DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
 SLInitHook.x86=1
 SLInitOffset.x86=5B18A
 SLInitFunc.x86=New_CSLQuery_Initialize
@@ -3550,24 +3554,28 @@ SLInitOffset.x64=1ABFC
 SLInitFunc.x64=New_CSLQuery_Initialize
 
 [10.0.17763.292]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
 LocalOnlyPatch.x86=1
 LocalOnlyOffset.x86=AFAD4
 LocalOnlyCode.x86=jmpshort
 LocalOnlyPatch.x64=1
 LocalOnlyOffset.x64=77A11
 LocalOnlyCode.x64=jmpshort
+; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
 SingleUserPatch.x86=1
 SingleUserOffset.x86=4D665
 SingleUserCode.x86=nop
 SingleUserPatch.x64=1
 SingleUserOffset.x64=1322C
 SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
 DefPolicyPatch.x86=1
 DefPolicyOffset.x86=4BE69
 DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
 DefPolicyPatch.x64=1
 DefPolicyOffset.x64=17F45
 DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
 SLInitHook.x86=1
 SLInitOffset.x86=5B18A
 SLInitFunc.x86=New_CSLQuery_Initialize
@@ -3602,24 +3610,28 @@ SLInitOffset.x64=1ABFC
 SLInitFunc.x64=New_CSLQuery_Initialize
 
 [10.0.17763.437]
+; Patch CEnforcementCore::GetInstanceOfTSLicense
 LocalOnlyPatch.x86=1
 LocalOnlyOffset.x86=AFE24
 LocalOnlyCode.x86=jmpshort
 LocalOnlyPatch.x64=1
 LocalOnlyOffset.x64=77A41
 LocalOnlyCode.x64=jmpshort
+; Patch CSessionArbitrationHelper::IsSingleSessionPerUserEnabled
 SingleUserPatch.x86=1
 SingleUserOffset.x86=4D7B5
 SingleUserCode.x86=nop
 SingleUserPatch.x64=1
 SingleUserOffset.x64=1339C
 SingleUserCode.x64=Zero
+; Patch CDefPolicy::Query
 DefPolicyPatch.x86=1
 DefPolicyOffset.x86=4BFB9
 DefPolicyCode.x86=CDefPolicy_Query_eax_ecx
 DefPolicyPatch.x64=1
 DefPolicyOffset.x64=18025
 DefPolicyCode.x64=CDefPolicy_Query_eax_rcx
+; Hook CSLQuery::Initialize
 SLInitHook.x86=1
 SLInitOffset.x86=5B2CA
 SLInitFunc.x86=New_CSLQuery_Initialize
@@ -5806,14 +5818,14 @@ ulMaxDebugSessions.x64=ECACC
 bFUSEnabled.x64       =ECAD0
 
 [10.0.17763.165-SLInit]
-bInitialized.x64 =ECAB0
-bServerSku.x64 =ECAB4
-lMaxUserSessions.x64 =ECAB8
+bInitialized.x64      =ECAB0
+bServerSku.x64        =ECAB4
+lMaxUserSessions.x64  =ECAB8
 bAppServerAllowed.x64 =ECAC0
 bRemoteConnAllowed.x64=ECAC4
-bMultimonAllowed.x64 =ECAC8
+bMultimonAllowed.x64  =ECAC8
 ulMaxDebugSessions.x64=ECACC
-bFUSEnabled.x64 =ECAD0
+bFUSEnabled.x64       =ECAD0
 
 [10.0.17763.168-SLInit]
 bInitialized.x86      =CD798
@@ -5854,42 +5866,42 @@ ulMaxDebugSessions.x64=ECACC
 bFUSEnabled.x64       =ECAD0
 
 [10.0.17763.292-SLInit]
-bInitialized.x86 =CD798
-bServerSku.x86 =CD79C
-lMaxUserSessions.x86 =CD7A0
+bInitialized.x86      =CD798
+bServerSku.x86        =CD79C
+lMaxUserSessions.x86  =CD7A0
 bAppServerAllowed.x86 =CD7A8
 bRemoteConnAllowed.x86=CD7AC
-bMultimonAllowed.x86 =CD7B0
+bMultimonAllowed.x86  =CD7B0
 ulMaxDebugSessions.x86=CD7B4
-bFUSEnabled.x86 =CD7B8
+bFUSEnabled.x86       =CD7B8
 
-bInitialized.x64 =ECAB0
-bServerSku.x64 =ECAB4
-lMaxUserSessions.x64 =ECAB8
+bInitialized.x64      =ECAB0
+bServerSku.x64        =ECAB4
+lMaxUserSessions.x64  =ECAB8
 bAppServerAllowed.x64 =ECAC0
 bRemoteConnAllowed.x64=ECAC4
-bMultimonAllowed.x64 =ECAC8
+bMultimonAllowed.x64  =ECAC8
 ulMaxDebugSessions.x64=ECACC
-bFUSEnabled.x64 =ECAD0
+bFUSEnabled.x64       =ECAD0
 
 [10.0.17763.379-SLInit]
-bInitialized.x86 =CD798
-bServerSku.x86 =CD79C
-lMaxUserSessions.x86 =CD7A0
+bInitialized.x86      =CD798
+bServerSku.x86        =CD79C
+lMaxUserSessions.x86  =CD7A0
 bAppServerAllowed.x86 =CD7A8
 bRemoteConnAllowed.x86=CD7AC
-bMultimonAllowed.x86 =CD7B0
+bMultimonAllowed.x86  =CD7B0
 ulMaxDebugSessions.x86=CD7B4
-bFUSEnabled.x86 =CD7B8
+bFUSEnabled.x86       =CD7B8
 
-bInitialized.x64 =ECAB0
-bServerSku.x64 =ECAB4
-lMaxUserSessions.x64 =ECAB8
+bInitialized.x64      =ECAB0
+bServerSku.x64        =ECAB4
+lMaxUserSessions.x64  =ECAB8
 bAppServerAllowed.x64 =ECAC0
 bRemoteConnAllowed.x64=ECAC4
-bMultimonAllowed.x64 =ECAC8
+bMultimonAllowed.x64  =ECAC8
 ulMaxDebugSessions.x64=ECACC
-bFUSEnabled.x64 =ECAD0
+bFUSEnabled.x64       =ECAD0
 
 [10.0.17763.437-SLInit]
 bInitialized.x86      =CD798
@@ -5900,6 +5912,7 @@ bRemoteConnAllowed.x86=CD7AC
 bMultimonAllowed.x86  =CD7B0
 ulMaxDebugSessions.x86=CD7B4
 bFUSEnabled.x86       =CD7B8
+
 bInitialized.x64      =ECAB0
 bServerSku.x64        =ECAB4
 lMaxUserSessions.x64  =ECAB8
@@ -5909,15 +5922,6 @@ bMultimonAllowed.x64  =ECAC8
 ulMaxDebugSessions.x64=ECACC
 bFUSEnabled.x64       =ECAD0
 
-bInitialized.x64 =ECAB0
-bServerSku.x64 =ECAB4
-lMaxUserSessions.x64 =ECAB8
-bAppServerAllowed.x64 =ECAC0
-bRemoteConnAllowed.x64=ECAC4
-bMultimonAllowed.x64 =ECAC8
-ulMaxDebugSessions.x64=ECACC
-bFUSEnabled.x64 =ECAD0
-
 [10.0.18362.1-SLInit]
 bInitialized.x86      =D477C
 bServerSku.x86        =D4780
@@ -5927,6 +5931,7 @@ bRemoteConnAllowed.x86=D4790
 bMultimonAllowed.x86  =D4794
 ulMaxDebugSessions.x86=D4798
 bFUSEnabled.x86       =D479C
+
 bInitialized.x64      =F6A8C
 bServerSku.x64        =F6A90
 lMaxUserSessions.x64  =F6A94
@@ -5945,6 +5950,7 @@ bRemoteConnAllowed.x86=D5790
 bMultimonAllowed.x86  =D5794
 ulMaxDebugSessions.x86=D5798
 bFUSEnabled.x86       =D579C
+
 bInitialized.x64      =F6A8C
 bServerSku.x64        =F6A90
 lMaxUserSessions.x64  =F6A94