diff --git a/software/drscl/drscl.exe b/software/drscl/drscl.exe
new file mode 100644
index 0000000..b2f6b61
Binary files /dev/null and b/software/drscl/drscl.exe differ
diff --git a/software/drscl/drscl.vcxproj b/software/drscl/drscl.vcxproj
index cd90266..8f23c97 100644
--- a/software/drscl/drscl.vcxproj
+++ b/software/drscl/drscl.vcxproj
@@ -56,7 +56,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>C:\meg\online\drivers\drs;c:\midas\include;c:\mxml;c:\midas\drivers\vme\sis3100\windows\;c:\meg\online\drivers\ace\;c:\meg\online\drivers\drs\libusb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\drs4eb\software\include;C:\drs4eb\software;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_USB;HAVE_LIBUSB10;CF_VIA_USBx;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -75,7 +75,7 @@
       <Culture>0x0807</Culture>
     </ResourceCompile>
     <Link>
-      <OutputFile>.\Release/drscl.exe</OutputFile>
+      <OutputFile>./drscl.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>.\Release/drscl.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -93,7 +93,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>C:\meg\online\drivers\drs;c:\midas\include;c:\mxml;c:\midas\drivers\vme\sis3100\windows\;c:\meg\online\drivers\ace\;c:\midas\mscb\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\drs4eb\software\include;C:\drs4eb\software;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_USB;HAVE_LIBUSB10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -131,8 +131,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\averager.cpp" />
-    <ClCompile Include="..\DRS.cpp" />
+    <ClCompile Include="..\src\averager.cpp" />
+    <ClCompile Include="..\src\DRS.cpp" />
     <ClCompile Include="drscl.cpp" />
     <ClCompile Include="..\..\..\..\..\midas\drivers\usb\musbstd.c" />
     <ClCompile Include="..\..\..\..\..\mxml\mxml.c" />
diff --git a/software/drscl/drscl.vcxproj.filters b/software/drscl/drscl.vcxproj.filters
index 75c5276..82e5ebe 100644
--- a/software/drscl/drscl.vcxproj.filters
+++ b/software/drscl/drscl.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\DRS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="drscl.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -30,7 +27,10 @@
     <ClCompile Include="..\..\..\..\..\mxml\strlcpy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\averager.cpp">
+    <ClCompile Include="..\src\averager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\DRS.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/software/src/DRS.cpp b/software/src/DRS.cpp
index dfc9b9a..05d98aa 100644
--- a/software/src/DRS.cpp
+++ b/software/src/DRS.cpp
@@ -2320,7 +2320,7 @@ int DRSBoard::SetSyncDelay(int ticks)
 
 int DRSBoard::SetReadoutDelay(float milliseconds)
 {
-   unsigned int ticks = milliseconds * 30303;
+   unsigned int ticks = (unsigned int)(milliseconds * 30303);
    if (fBoardType == 9) {
       Write(T_CTRL, REG_READOUT_DELAY, &ticks, 4);
       return 1;
@@ -3194,7 +3194,7 @@ int DRSBoard::ChipTest(int flag)
          if (t >=   0.99 && delta_t == 0.1) delta_t = 1;
          if (t >=   9.99 && delta_t == 1)   delta_t = 10;
 
-         SetReadoutDelay(t);
+         SetReadoutDelay((float)t);
          
          // average over 10 waveforms
          printf(".");