diff --git a/Speedy Eggbert 2 Source.vcxproj b/Speedy Eggbert 2 Source.vcxproj
index 7d35788..3dea5fd 100644
--- a/Speedy Eggbert 2 Source.vcxproj	
+++ b/Speedy Eggbert 2 Source.vcxproj	
@@ -23,14 +23,13 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{e424a3cb-c8b8-447c-be63-41a57e65b449}</ProjectGuid>
     <RootNamespace>SpeedyEggbert2Source</RootNamespace>
-    <WindowsTargetPlatformVersion>
-    </WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
diff --git a/src/blupi.cpp b/src/blupi.cpp
index e9a507d..baf6827 100644
--- a/src/blupi.cpp
+++ b/src/blupi.cpp
@@ -3,6 +3,8 @@
 
 #define WIN32_LEAN_AND_MEAN
 
+typedef struct IUnknown IUnknown;
+
 #include <windows.h>
 #include <windowsx.h>
 #include <WTypes.h>
diff --git a/src/button.cpp b/src/button.cpp
index d46828e..331c001 100644
--- a/src/button.cpp
+++ b/src/button.cpp
@@ -6,6 +6,8 @@
 //#include <stdio.h>
 //#include <ddraw.h>
 
+typedef struct IUnknown IUnknown;
+
 #ifndef POINT
 #include <windows.h>
 #endif
diff --git a/src/ddutil.cpp b/src/ddutil.cpp
index 1cb9610..a48b4ab 100644
--- a/src/ddutil.cpp
+++ b/src/ddutil.cpp
@@ -6,6 +6,9 @@
  *  Content:    Routines for loading bitmap and palettes from resources
  *
  ***************************************************************************/
+
+typedef struct IUnknown IUnknown;
+
 #undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/src/decblock.cpp b/src/decblock.cpp
index b4600e8..9626dca 100644
--- a/src/decblock.cpp
+++ b/src/decblock.cpp
@@ -1,6 +1,9 @@
 // DecBlock.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
+
 #include "def.h"
 #include "decor.h"
 #include "misc.h"
diff --git a/src/decblupi.cpp b/src/decblupi.cpp
index 6367b4b..9f06fad 100644
--- a/src/decblupi.cpp
+++ b/src/decblupi.cpp
@@ -1,6 +1,8 @@
 // DecBlupi.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
 #include "misc.h"
 #include "decor.h"
 #include "text.h" // debug
diff --git a/src/decdesign.cpp b/src/decdesign.cpp
index 52395f1..79c9a70 100644
--- a/src/decdesign.cpp
+++ b/src/decdesign.cpp
@@ -1,6 +1,9 @@
 // DecDesign.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
+
 #include "def.h"
 #include "decor.h"
 #include "misc.h"
diff --git a/src/decio.cpp b/src/decio.cpp
index d0bb59e..6277c1e 100644
--- a/src/decio.cpp
+++ b/src/decio.cpp
@@ -1,6 +1,9 @@
 // DecIO.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
+
 #include "def.h"
 #include "decor.h"
 #include "misc.h"
diff --git a/src/decmove.cpp b/src/decmove.cpp
index 0c4592f..e579736 100644
--- a/src/decmove.cpp
+++ b/src/decmove.cpp
@@ -1,6 +1,9 @@
 // DecMove.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
+
 #include "def.h"
 #include "decor.h"
 #include "misc.h"
diff --git a/src/decnet.cpp b/src/decnet.cpp
index 6dfb509..6b78ec6 100644
--- a/src/decnet.cpp
+++ b/src/decnet.cpp
@@ -1,6 +1,9 @@
 // DecNet.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
+
 #include "def.h"
 #include "decor.h"
 #include "misc.h"
diff --git a/src/decor.cpp b/src/decor.cpp
index 9d32896..5613fc9 100644
--- a/src/decor.cpp
+++ b/src/decor.cpp
@@ -1,6 +1,9 @@
 // Decor.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
+
 //#include <windows.h>
 //#include <stdlib.h>
 //#include <stdio.h>
diff --git a/src/def.h b/src/def.h
index 1436084..d5a6340 100644
--- a/src/def.h
+++ b/src/def.h
@@ -1363,32 +1363,44 @@ POINT operator/(POINT p, const int& a)
 
 POINT& operator+=(POINT& p, const POINT& a)
 {
-	return POINT( p.x += a.x, p.y += a.y );
+	p.x += a.x;
+	p.y += a.y;
+	return p;
 }
 
 POINT& operator-=(POINT& p, const POINT& a)
 {
-	return POINT( p.x -= a.x, p.y -= a.y );
+	p.x -= a.x;
+	p.y -= a.y;
+	return p;
 }
 
 POINT& operator*=(POINT& p, const POINT& a)
 {
-	return POINT( p.x *= a.x, p.y *= a.y );
+	p.x *= a.x;
+	p.y *= a.y;
+	return p;
 }
 
 POINT& operator/=(POINT& p, const POINT& a)
 {
-	return POINT( p.x /= a.x, p.y /= a.y );
+	p.x /= a.x;
+	p.y /= a.y;
+	return p;
 }
 
 POINT& operator*=(POINT& p, const int& a)
 {
-	return POINT( p.x *= a, p.y *= a );
+	p.x *= a;
+	p.y *= a;
+	return p;
 }
 
 POINT& operator/=(POINT& p, const int& a)
 {
-	return POINT( p.x /= a, p.y /= a );
+	p.x /= a;
+	p.y /= a;
+	return p;
 }
 
 bool operator!=(POINT a, const POINT& b)
diff --git a/src/event.cpp b/src/event.cpp
index 53a76fb..7f72e0c 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -1,6 +1,9 @@
 // Event.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
+
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -2423,7 +2426,7 @@ BOOL CEvent::DrawButtons()
 
 	if (m_phase == WM_PHASE_INIT)
 	{
-		DrawText(m_pPixmap, POINT( 414, 446 ), "Version 2.2", FONTLITTLE);
+		DrawText(m_pPixmap, POINT( 414, 446 ), const_cast<char*>("Version 2.2"), FONTLITTLE);
 	}
 
 	if (m_phase == WM_PHASE_GAMER)
@@ -2909,7 +2912,7 @@ BOOL CEvent::DrawButtons()
 	// now that the decomp is looking convincingly like the retail game,
 	// we should clearly differentiate the two when sharing WIP screenshots/videos to reduce confusion.
 	{
-		DrawTextLeft(m_pPixmap, POINT(LXIMAGE - GetTextWidth("DECOMP -- " __DATE__), 0), "DECOMP -- " __DATE__, FONTGOLD);
+		DrawTextLeft(m_pPixmap, POINT(LXIMAGE - GetTextWidth(const_cast<char*>("DECOMP -- " __DATE__)), 0), const_cast<char*>("DECOMP -- " __DATE__), FONTGOLD);
 	}
 	///////
 
diff --git a/src/jauge.cpp b/src/jauge.cpp
index f94a787..100b4c4 100644
--- a/src/jauge.cpp
+++ b/src/jauge.cpp
@@ -1,6 +1,9 @@
 // Jauge.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
+
 #include <windows.h>
 //#include <stdlib.h>
 //#include <stdio.h>
diff --git a/src/menu.cpp b/src/menu.cpp
index 753d71d..9ccd8af 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -1,6 +1,8 @@
 // Menu.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/misc.cpp b/src/misc.cpp
index 9a4af20..643405e 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -1,6 +1,9 @@
 // Misc.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
+
 #include <dsound.h>
 #include <ddraw.h>
 #include <stdio.h>
diff --git a/src/movie.cpp b/src/movie.cpp
index 1196e8f..4ead7dd 100644
--- a/src/movie.cpp
+++ b/src/movie.cpp
@@ -1,6 +1,9 @@
 // movie.cpp
 //
 
+typedef struct IUnknown IUnknown;
+
+
 #include <windows.h>
 #include <windowsx.h>
 #include <commdlg.h>
@@ -33,7 +36,7 @@ BOOL CMovie::initAVI()
 	// set up the open parameters
 	mciOpen.dwCallback 		 = 0L;
 	mciOpen.wDeviceID 		 = 0;
-	mciOpen.lpstrDeviceType  = AVI_VIDEO;
+	mciOpen.lpstrDeviceType  = const_cast<char*>(AVI_VIDEO);
 	mciOpen.lpstrElementName = NULL;
 	mciOpen.lpstrAlias 		 = NULL;
 	mciOpen.dwStyle 		 = 0;
diff --git a/src/network.cpp b/src/network.cpp
index 4366610..2e35d69 100644
--- a/src/network.cpp
+++ b/src/network.cpp
@@ -1,6 +1,9 @@
 // Network.cpp
 //
 
+
+typedef struct IUnknown IUnknown;
+
 #include <stdio.h>
 #include <windows.h>
 #include "dplay.h"
diff --git a/src/pixmap.cpp b/src/pixmap.cpp
index a8c751c..530c0fb 100644
--- a/src/pixmap.cpp
+++ b/src/pixmap.cpp
@@ -1,6 +1,9 @@
 // CPixmap.cpp
 //
 
+
+typedef struct IUnknown IUnknown;
+
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/sound.cpp b/src/sound.cpp
index 5dcebbc..4b002ad 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -1,5 +1,8 @@
 // sound.cpp
 //
+
+typedef struct IUnknown IUnknown;
+
 #include "def.h"
 
 #if _BASS && !_LEGACY
diff --git a/src/text.cpp b/src/text.cpp
index 973f554..1681de7 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -1,5 +1,8 @@
 // Text.cpp
 
+typedef struct IUnknown IUnknown;
+
+
 //#include <windows.h>
 //#include <stdlib.h>
 //#include <stdio.h>
diff --git a/src/wave.cpp b/src/wave.cpp
index f11a909..42c6c1a 100644
--- a/src/wave.cpp
+++ b/src/wave.cpp
@@ -9,6 +9,8 @@
  *
  ******************************************************************/
 
+typedef struct IUnknown IUnknown;
+
 #include <windows.h>
 #include "wave.h"