diff --git a/EpdBase/EpdBase.vcxproj b/EpdBase/EpdBase.vcxproj
index c346332..2b744cf 100644
--- a/EpdBase/EpdBase.vcxproj
+++ b/EpdBase/EpdBase.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{3114A047-7562-42FE-94DE-2418EF19AD9A}</ProjectGuid>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <Keyword>ManagedCProj</Keyword>
     <RootNamespace>EpdBase</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
diff --git a/SetupProject1/Product.wxs b/SetupProject1/Product.wxs
index 4694492..a7a3773 100644
--- a/SetupProject1/Product.wxs
+++ b/SetupProject1/Product.wxs
@@ -1,95 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-    <?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
-  <?define eDosSync_TargetDir=$(var.syncEdosLocal.TargetDir)?><?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
-	<Product Id="*" Name="eDosStation" Language="1033" Version="1.0.1.0" Manufacturer="SCK CEN Luc" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8" >
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" />
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+   xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
+  <?define eDosSync_TargetDir=$(var.syncEdosLocal.TargetDir)?>
+  <?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
+  <Product Id="*" Name="eDosStation" Language="1033" Version="1.0.1.0" Manufacturer="SCK CEN Luc" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8" >
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" />
     <Media Id="1" EmbedCab="yes" Cabinet="cab"  />
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <Feature Id="eDosStationFeature" Title="eDosStation" Level="1">
-			<ComponentGroupRef Id="eDosStation" />
+      <ComponentGroupRef Id="eDosStation" />
+      
     </Feature>
     <Feature Id="eDosSyncFeature" Title="eDosSync" Level="1">
       <ComponentGroupRef Id="eDosSync" />
       <ComponentGroupRef Id="SyncLog"/>
+      <ComponentRef Id="eDosSyncShortcut"/>
     </Feature>
   </Product>
 
 
-  <Fragment>
-    <CustomAction Id="CreateScheduledTask" Return="check" Directory="eDosSyncFolder"
-                  Execute="deferred" 
-                  Impersonate="no"
-                  ExeCommand="SCHTASKS.EXE /CREATE /TN &quot;EDos Sync&quot; /RP &quot;Infopla+8&quot; /XML &quot;[eDosSyncFolder]\edossync.xml&quot;" />
-  </Fragment>
+
 
   <Fragment>
-    <InstallExecuteSequence>
-      <Custom Action='CreateScheduledTask' After='InstallFiles'/>
-    </InstallExecuteSequence>
-  </Fragment>
-  
-  
-	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="ProgramFilesFolder">
-					<Directory Id="INSTALLFOLDER" Name="eDos">
-            <Directory Id="eDosStationFolder" Name="eDosStation" />
-            <Directory Id="eDosSyncFolder" Name="eDosSync" />
-					</Directory>
-			</Directory>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="eDos">
+          <Directory Id="eDosStationFolder" Name="eDosStation" />
+          <Directory Id="eDosSyncFolder" Name="eDosSync" />
+        </Directory>
+      </Directory>
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ApplicationProgramsFolder" Name="eDos"/>
       </Directory>
       <Directory Id="LogFolder" />
-		</Directory>
-	</Fragment>
+    </Directory>
+  </Fragment>
 
   <Fragment>
     <SetDirectory Id="LogFolder" Value="[WindowsVolume]Logs" />
-   
   </Fragment>
-    
 
-	<Fragment>
-		<ComponentGroup Id="eDosStation" Directory="eDosStationFolder">
-			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
-			<!-- <Component Id="ProductComponent"> -->
-				<!-- TODO: Insert files, registry keys, and other resources here. -->
-			<!-- </Component> -->
-			<Component Id="IR_READER_MS_DLL.dll" Guid="7dc99dd1-1611-4397-84ba-ae56ed455f68">
-			  <File Id="IR_READER_MS_DLL.dll" Name="IR_READER_MS_DLL.dll" Source="$(var.eDosStation_TargetDir)IR_READER_MS_DLL.dll" ProcessorArchitecture="x86" Vital="yes"  />
-			</Component>
-			<Component Id="Reader2.dll" Guid="64258699-5bc6-49bf-a01c-2297206a37d4" >
-			  <File Id="Reader2.dll" Name="Reader2.dll" Source="$(var.eDosStation_TargetDir)Reader2.dll" />
-			</Component>
-			<Component Id="eDosStation.exe.config" Guid="f052d72c-32dd-4108-80b4-35773564b2cc">
-			  <File Id="eDosStation.exe.config" Name="eDosStation.exe.config" Source="$(var.eDosStation_TargetDir)eDosStation.exe.config" />
-			</Component>
-			<Component Id="eDosStation.exe" Guid="bf9a54fc-5185-4e37-81eb-dfbf63d2586a">
-			  <File Id="eDosStation.exe" Name="eDosStation.exe" Source="$(var.eDosStation_TargetDir)eDosStation.exe" />
-			</Component>
-			<Component Id="Telerik.Windows.Data.dll" Guid="8d506a90-f3ff-40ac-8c5c-fc89af3fc9f3">
-			  <File Id="Telerik.Windows.Data.dll" Name="Telerik.Windows.Data.dll" Source="$(var.eDosStation_TargetDir)Telerik.Windows.Data.dll" />
-			</Component>
-			<Component Id="Telerik.Windows.Controls.dll" Guid="fe4f1f6a-cb0b-4487-a5b9-262dc004730a">
-			  <File Id="Telerik.Windows.Controls.dll" Name="Telerik.Windows.Controls.dll" Source="$(var.eDosStation_TargetDir)Telerik.Windows.Controls.dll" />
-			</Component>
-			<Component Id="Telerik.Windows.Controls.GridView.dll" Guid="e541128e-bbec-46e2-85ba-0698d2e1e42e">
-			  <File Id="Telerik.Windows.Controls.GridView.dll" Name="Telerik.Windows.Controls.GridView.dll" Source="$(var.eDosStation_TargetDir)Telerik.Windows.Controls.GridView.dll" />
-			</Component>
-			<Component Id="Telerik.Windows.Controls.Input.dll" Guid="a1ee1a08-793e-4b55-a122-b3f1726f4f78">
-			  <File Id="Telerik.Windows.Controls.Input.dll" Name="Telerik.Windows.Controls.Input.dll" Source="$(var.eDosStation_TargetDir)Telerik.Windows.Controls.Input.dll" />
-			</Component>
-			<Component Id="LSWDesfirePublic.dll" Guid="aac035cc-de9b-4dc6-92ae-7f0e173928c6">
-			  <File Id="LSWDesfirePublic.dll" Name="LSWDesfirePublic.dll" Source="$(var.eDosStation_TargetDir)LSWDesfirePublic.dll" />
-			</Component>
-			<Component Id="EpdBaseClr.dll" Guid="ed22005b-b3ba-4821-a598-d076ac94ea72">
-			  <File Id="EpdBaseClr.dll" Name="EpdBaseClr.dll" Source="$(var.eDosStation_TargetDir)EpdBaseClr.dll" />
-			</Component>
+  <Fragment>
+    
+    <DirectoryRef Id="eDosStationFolder">
       <Component Id="eDosStationShortcut" Guid="85AF80D8-11AC-4B82-89F8-5764A41EF3CE">
         <Shortcut Id="eDosStationMenuShortcut"
                   Name="eDos Station"
@@ -99,7 +54,54 @@
         <RemoveFolder Id="CleanUpeDosStationShortcut" Directory="ApplicationProgramsFolder" On="uninstall"/>
         <RegistryValue Root="HKLM" Key="Software\SCKCEN\eDosStation" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
       </Component>
-		</ComponentGroup>
+    </DirectoryRef>
+    
+    <DirectoryRef Id="eDosSyncFolder">
+      <Component Id="eDosSyncShortcut" Guid="ED01D079-54BA-4D1E-ACCF-6A79565C9D32">
+        <Shortcut Id="eDosSyncMenuShortcut"
+                 Name="eDos sync"
+                 Description="eDos sync to/from local"
+                 Target="[#syncEdosLocal.exe]"
+                 WorkingDirectory="eDosSyncFolder"/>
+        <RemoveFolder Id="CleanUpeDosSyncShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
+        <RegistryValue Root="HKLM" Key="Software\SCKCEN\eDosSync" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+      </Component>
+    </DirectoryRef>
+
+    <ComponentGroup Id="eDosStation" Directory="eDosStationFolder">
+      <ComponentRef Id="eDosStationShortcut"/>
+      <Component Id="eDosStation.exe" Guid="bf9a54fc-5185-4e37-81eb-dfbf63d2586a">
+        <File Id="eDosStation.exe" Name="eDosStation.exe" Source="$(var.eDosStation_TargetDir)eDosStation.exe" />
+      </Component>
+      <Component Id="eDosStation.exe.config" Guid="f052d72c-32dd-4108-80b4-35773564b2cc">
+        <File Id="eDosStation.exe.config" Name="eDosStation.exe.config" Source="$(var.eDosStation_TargetDir)eDosStation.exe.config" />
+      </Component>
+      <Component Id="IR_READER_MS_DLL.dll" Guid="7dc99dd1-1611-4397-84ba-ae56ed455f68">
+        <File Id="IR_READER_MS_DLL.dll" Name="IR_READER_MS_DLL.dll" Source="$(var.eDosStation_TargetDir)IR_READER_MS_DLL.dll" ProcessorArchitecture="x86" Vital="yes"  />
+      </Component>
+      <Component Id="Reader2.dll" Guid="64258699-5bc6-49bf-a01c-2297206a37d4" >
+        <File Id="Reader2.dll" Name="Reader2.dll" Source="$(var.eDosStation_TargetDir)Reader2.dll" />
+      </Component>
+      <Component Id="Telerik.Windows.Data.dll" Guid="8d506a90-f3ff-40ac-8c5c-fc89af3fc9f3">
+        <File Id="Telerik.Windows.Data.dll" Name="Telerik.Windows.Data.dll" Source="$(var.eDosStation_TargetDir)Telerik.Windows.Data.dll" />
+      </Component>
+      <Component Id="Telerik.Windows.Controls.dll" Guid="fe4f1f6a-cb0b-4487-a5b9-262dc004730a">
+        <File Id="Telerik.Windows.Controls.dll" Name="Telerik.Windows.Controls.dll" Source="$(var.eDosStation_TargetDir)Telerik.Windows.Controls.dll" />
+      </Component>
+      <Component Id="Telerik.Windows.Controls.GridView.dll" Guid="e541128e-bbec-46e2-85ba-0698d2e1e42e">
+        <File Id="Telerik.Windows.Controls.GridView.dll" Name="Telerik.Windows.Controls.GridView.dll" Source="$(var.eDosStation_TargetDir)Telerik.Windows.Controls.GridView.dll" />
+      </Component>
+      <Component Id="Telerik.Windows.Controls.Input.dll" Guid="a1ee1a08-793e-4b55-a122-b3f1726f4f78">
+        <File Id="Telerik.Windows.Controls.Input.dll" Name="Telerik.Windows.Controls.Input.dll" Source="$(var.eDosStation_TargetDir)Telerik.Windows.Controls.Input.dll" />
+      </Component>
+      <Component Id="LSWDesfirePublic.dll" Guid="aac035cc-de9b-4dc6-92ae-7f0e173928c6">
+        <File Id="LSWDesfirePublic.dll" Name="LSWDesfirePublic.dll" Source="$(var.eDosStation_TargetDir)LSWDesfirePublic.dll" />
+      </Component>
+      <Component Id="EpdBaseClr.dll" Guid="ed22005b-b3ba-4821-a598-d076ac94ea72">
+        <File Id="EpdBaseClr.dll" Name="EpdBaseClr.dll" Source="$(var.eDosStation_TargetDir)EpdBaseClr.dll" />
+      </Component>
+
+    </ComponentGroup>
     <ComponentGroup Id="eDosSync" Directory="eDosSyncFolder">
       <Component Id="syncEdosLocal.exe.config" Guid="d1c4ba86-8a63-4b73-9179-a5eab405f8cb">
         <File Id="syncEdosLocal.exe.config" Name="syncEdosLocal.exe.config" Source="$(var.syncEdosLocal_TargetDir)syncEdosLocal.exe.config" />
@@ -116,15 +118,7 @@
       <Component Id="eDosSync.xml" Guid="BC0FB8C2-26B1-47A5-A76F-C0ABE466770D">
         <File Id="eDosSync.xml" Name="eDosSync.xml" Source="$(var.syncEdosLocal_TargetDir)eDosSync.xml" />
       </Component>
-      <Component Id="eDosSyncShortcut" Guid="ED01D079-54BA-4D1E-ACCF-6A79565C9D32">
-        <Shortcut Id="eDosSyncMenuShortcut"
-                 Name="eDos sync"
-                 Description="eDos sync to/from local"
-                 Target="[#syncEdosLocal.exe]"
-                 WorkingDirectory="eDosSyncFolder"/>
-        <RemoveFolder Id="CleanUpeDosSyncShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
-        <RegistryValue Root="HKLM" Key="Software\SCKCEN\eDosSync" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
-      </Component>
+
     </ComponentGroup>
     <ComponentGroup Id="SyncLog">
       <Component Id="CreateLogFolder" Directory="LogFolder" Guid="EF959CF0-DC34-42A1-9031-2FE454DBED24">
@@ -133,10 +127,22 @@
         </CreateFolder>
       </Component>
     </ComponentGroup>
- 
-   
-	</Fragment>
 
-  
- 
+
+  </Fragment>
+
+  <Fragment>
+    <CustomAction Id="CreateScheduledTask" Return="check" Directory="eDosSyncFolder"
+                  Execute="deferred"
+                  Impersonate="no"
+                  ExeCommand="SCHTASKS.EXE /CREATE /TN &quot;EDos Sync&quot; /RP &quot;Infopla+8&quot; /XML &quot;[eDosSyncFolder]\edossync.xml&quot;" />
+  </Fragment>
+
+  <Fragment>
+    <InstallExecuteSequence>
+      <Custom Action='CreateScheduledTask' After='InstallFiles'/>
+    </InstallExecuteSequence>
+  </Fragment>
+
+
 </Wix>
diff --git a/eDosStation.sln b/eDosStation.sln
index 8e96550..91b5af6 100644
--- a/eDosStation.sln
+++ b/eDosStation.sln
@@ -118,7 +118,6 @@ Global
 		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Debug|x64.ActiveCfg = Debug|x64
 		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Debug|x64.Build.0 = Debug|x64
 		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Debug|x86.ActiveCfg = Debug|Win32
-		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Debug|x86.Build.0 = Debug|Win32
 		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Release|Any CPU.ActiveCfg = Release|Win32
 		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Release|Any CPU.Build.0 = Release|Win32
 		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Release|ARM.ActiveCfg = Release|Win32
@@ -126,7 +125,6 @@ Global
 		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Release|x64.ActiveCfg = Release|x64
 		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Release|x64.Build.0 = Release|x64
 		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Release|x86.ActiveCfg = Release|Win32
-		{F98F3496-8A4C-4BDB-9F17-C7AF47A60739}.Release|x86.Build.0 = Release|Win32
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -136,7 +134,6 @@ Global
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Debug|x64.Build.0 = Debug|Any CPU
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Debug|x86.Build.0 = Debug|Any CPU
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Release|ARM.ActiveCfg = Release|Any CPU
@@ -146,7 +143,6 @@ Global
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Release|x64.ActiveCfg = Release|Any CPU
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Release|x64.Build.0 = Release|Any CPU
 		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Release|x86.ActiveCfg = Release|Any CPU
-		{6AC69ACE-3666-4A3D-A4B9-FFA24C424C1B}.Release|x86.Build.0 = Release|Any CPU
 		{B2264FF1-0F36-401B-91FE-DB3087CE05F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2264FF1-0F36-401B-91FE-DB3087CE05F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B2264FF1-0F36-401B-91FE-DB3087CE05F5}.Debug|ARM.ActiveCfg = Debug|Any CPU
diff --git a/syncEdosLocal/Program.cs b/syncEdosLocal/Program.cs
index 240dbc2..176a158 100644
--- a/syncEdosLocal/Program.cs
+++ b/syncEdosLocal/Program.cs
@@ -305,19 +305,19 @@ namespace syncEdosLocal
             System.Diagnostics.Debug.WriteLine(messages.ToString());
             Console.WriteLine(messages.ToString());
 
-            var smtpFrom = System.Configuration.ConfigurationManager.AppSettings["smtpFrom"];
-            var smtpServer = System.Configuration.ConfigurationManager.AppSettings["smtpServer"];
-            int smtpPort = 25;
-            if (int.TryParse(System.Configuration.ConfigurationManager.AppSettings["smtpPort"], out int newSMTPPort)) smtpPort = newSMTPPort; ;
-            using (System.Net.Mail.MailMessage m = new System.Net.Mail.MailMessage())
-            {
-                m.From = new System.Net.Mail.MailAddress(smtpFrom);
-                m.To.Add("lvandenb@sckcen.be");
-                m.Subject = "SynceDosLocal " + (error ? "Error" : "No errors") + (warning ? " Warnings" : "");
-                m.IsBodyHtml = true;
-                m.Body = Bulker.htmlLog.ToString();
-                using (var mc = new System.Net.Mail.SmtpClient(smtpServer, smtpPort)) { mc.Send(m); }
-            }
+            //var smtpFrom = System.Configuration.ConfigurationManager.AppSettings["smtpFrom"];
+            //var smtpServer = System.Configuration.ConfigurationManager.AppSettings["smtpServer"];
+            //int smtpPort = 25;
+            //if (int.TryParse(System.Configuration.ConfigurationManager.AppSettings["smtpPort"], out int newSMTPPort)) smtpPort = newSMTPPort; ;
+            //using (System.Net.Mail.MailMessage m = new System.Net.Mail.MailMessage())
+            //{
+            //    m.From = new System.Net.Mail.MailAddress(smtpFrom);
+            //    m.To.Add("lvandenb@sckcen.be");
+            //    m.Subject = "SynceDosLocal " + (error ? "Error" : "No errors") + (warning ? " Warnings" : "");
+            //    m.IsBodyHtml = true;
+            //    m.Body = Bulker.htmlLog.ToString();
+            //    using (var mc = new System.Net.Mail.SmtpClient(smtpServer, smtpPort)) { mc.Send(m); }
+            //}
             spLog.CloseSplunkLog();
         }
         static void DoorloopVisits(SqlConnection coLocal, SqlConnection coCentral, spl spLog, ref bool error)