diff --git a/.vs/NapoleonPP/v15/Browse.VC.db b/.vs/NapoleonPP/v15/Browse.VC.db
new file mode 100644
index 0000000..02cd3fa
Binary files /dev/null and b/.vs/NapoleonPP/v15/Browse.VC.db differ
diff --git a/NapoleonPP.old/.vs/NapoleonPP/v15/Browse.VC.db b/NapoleonPP.old/.vs/NapoleonPP/v15/Browse.VC.db
new file mode 100644
index 0000000..a2020eb
Binary files /dev/null and b/NapoleonPP.old/.vs/NapoleonPP/v15/Browse.VC.db differ
diff --git a/NapoleonPP.old/NapoleonPP.vcxproj b/NapoleonPP.old/NapoleonPP.vcxproj
index 15ae1a0..d82e724 100755
--- a/NapoleonPP.old/NapoleonPP.vcxproj
+++ b/NapoleonPP.old/NapoleonPP.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -26,21 +26,21 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -57,11 +57,15 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
+      <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>C:\Program Files\boost\boost_1_53_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <LanguageStandard>stdcpp14</LanguageStandard>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/movedatabase.h b/movedatabase.h
index f2d1d34..797cca3 100755
--- a/movedatabase.h
+++ b/movedatabase.h
@@ -1,6 +1,6 @@
 #ifndef MOVEDATABASE_H
 #define MOVEDATABASE_H
-#include <immintrin.h>
+#include "immintrin.h"
 #include "defines.h"
 #include "utils.h"
 #include "constants.h"
diff --git a/search.cpp b/search.cpp
index 4f9c302..a9f69b7 100755
--- a/search.cpp
+++ b/search.cpp
@@ -53,6 +53,7 @@ namespace Napoleon
         sendOutput = verbose;
         StopSignal = false;
         pondering = false;
+		PonderHit = false;
         searchInfo.SetDepthLimit(depth_limit);
 
         if (type == SearchType::Infinite || type == SearchType::Ponder)
diff --git a/uci.cpp b/uci.cpp
index da67ba3..63f8b23 100755
--- a/uci.cpp
+++ b/uci.cpp
@@ -140,7 +140,6 @@ namespace Napoleon
             }
             else if (cmd == "ponderhit")
             {
-                assert(false);
                 Search::PonderHit = true;
             }
         }
@@ -149,7 +148,7 @@ namespace Napoleon
     void Uci::go(istringstream& stream)
     {
         string token;
-        SearchType type;
+		SearchType type = SearchType::TimePerGame;
         bool san = false;
 
         while(stream >> token)
@@ -168,12 +167,12 @@ namespace Napoleon
             else if (token == "wtime")
             {
                 stream >> Search::GameTime[PieceColor::White];
-                type = SearchType::TimePerGame;
+                //type = SearchType::TimePerGame;
             }
             else if (token == "btime")
             {
                 stream >> Search::GameTime[PieceColor::Black];
-                type = SearchType::TimePerGame;
+                //type = SearchType::TimePerGame;
             }
             else if (token == "infinite")
             {