diff --git a/project/vc2010_mfc/VBA2010.sln b/project/vc2010_mfc/VBA2010.sln
index a3fe6d52..2baf7eec 100644
--- a/project/vc2010_mfc/VBA2010.sln
+++ b/project/vc2010_mfc/VBA2010.sln
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisualBoyAdvance", "VBA2010.vcxproj", "{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
@@ -9,21 +8,16 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
-		Template|Win32 = Template|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.Build.0 = Debug|Win32
 		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.ActiveCfg = Release|Win32
 		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.Build.0 = Release|Win32
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Template|Win32.ActiveCfg = Template|Win32
-		{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Template|Win32.Build.0 = Template|Win32
 		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
 		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
 		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Template|Win32.ActiveCfg = Release|Win32
-		{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Template|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/project/vc2010_mfc/VBA2010.suo b/project/vc2010_mfc/VBA2010.suo
index f2eb1873..a163de8f 100644
Binary files a/project/vc2010_mfc/VBA2010.suo and b/project/vc2010_mfc/VBA2010.suo differ
diff --git a/project/vc2010_mfc/VBA2010.vcxproj b/project/vc2010_mfc/VBA2010.vcxproj
index 478d2b5e..370b5481 100644
--- a/project/vc2010_mfc/VBA2010.vcxproj
+++ b/project/vc2010_mfc/VBA2010.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -69,15 +69,15 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" />
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;d:\Projects\dependencies\zlib\;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Include\;d:\Projects\dependencies\libpng\;c:\Program Files (x86)\OpenAL 1.1 SDK\include\;</IncludePath>
     <ExecutablePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);d:\Projects\Dev-Cpp\bin\;</ExecutablePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;d:\Projects\dependencies\zlib\;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Include\;d:\Projects\dependencies\libpng\;c:\Program Files (x86)\OpenAL 1.1 SDK\include\;</IncludePath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Lib\x86\;c:\Program Files (x86)\OpenAL 1.1 SDK\libs\;d:\Projects\dependencies\libs\;</LibraryPath>
     <ExecutablePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);d:\Projects\Dev-Cpp\bin\;</ExecutablePath>
-    <ExecutablePath Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);d:\Projects\Dev-Cpp\bin\;</ExecutablePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Lib\x86\;c:\Program Files (x86)\OpenAL 1.1 SDK\libs\;d:\Projects\dependencies\libs\;</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Lib\x86\;c:\Program Files (x86)\OpenAL 1.1 SDK\libs\;d:\Projects\dependencies\libs\;</LibraryPath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;d:\Projects\dependencies\zlib\;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Include\;d:\Projects\dependencies\libpng\;c:\Program Files (x86)\OpenAL 1.1 SDK\include\;</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Lib\x86\;c:\Program Files (x86)\OpenAL 1.1 SDK\libs\;d:\Projects\dependencies\libs\;</LibraryPath>
+    <ExecutablePath Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(VCInstallDir)bin;$(WindowsSdkDir)bin\NETFX 4.0 Tools;$(WindowsSdkDir)bin;$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(FrameworkSDKDir)\bin;$(MSBuildToolsPath32);$(VSInstallDir);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);d:\Projects\Dev-Cpp\bin\;</ExecutablePath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;d:\Projects\dependencies\zlib\;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Include\;d:\Projects\dependencies\libpng\;c:\Program Files (x86)\OpenAL 1.1 SDK\include\;</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;c:\Program Files (x86)\Microsoft DirectX SDK (August 2009)\Lib\x86\;c:\Program Files (x86)\OpenAL 1.1 SDK\libs\;d:\Projects\dependencies\libs\;</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
@@ -142,7 +142,7 @@
 /D_SECURE_SCL=0
 /Zc:forScope-
 /MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Full</Optimization>
+      <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -150,7 +150,7 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GBA_LOGGING;OEMRESOURCE;MMX;ASM;FINAL_VERSION;BKPT_SUPPORT;_CRT_SECURE_NO_DEPRECATE;HAS_FILE_EXTRACTOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -190,7 +190,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\gba\gbafilter.h" />
     <ClInclude Include="..\..\src\win32\resource.h" />
     <ClInclude Include="..\..\src\gb\gb.h" />
     <ClInclude Include="..\..\src\gb\gbCheats.h" />
@@ -318,7 +317,6 @@
     <ResourceCompile Include="..\..\src\win32\VBA.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\src\gba\gbafilter.cpp" />
     <ClCompile Include="..\..\src\gb\gb.cpp" />
     <ClCompile Include="..\..\src\gb\gbCheats.cpp" />
     <ClCompile Include="..\..\src\gb\gbDis.cpp" />
@@ -342,6 +340,7 @@
     <ClCompile Include="..\..\src\gba\gba-arm.cpp" />
     <ClCompile Include="..\..\src\gba\gba-thumb.cpp" />
     <ClCompile Include="..\..\src\gba\gba.cpp" />
+    <ClCompile Include="..\..\src\gba\gbafilter.cpp" />
     <ClCompile Include="..\..\src\gba\gbagfx.cpp" />
     <ClCompile Include="..\..\src\gba\Globals.cpp" />
     <ClCompile Include="..\..\src\gba\Mode0.cpp" />
diff --git a/project/vc2010_mfc/VBA2010.vcxproj.filters b/project/vc2010_mfc/VBA2010.vcxproj.filters
index 78a7a725..7ccdcb94 100644
--- a/project/vc2010_mfc/VBA2010.vcxproj.filters
+++ b/project/vc2010_mfc/VBA2010.vcxproj.filters
@@ -2,46 +2,46 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Core">
-      <UniqueIdentifier>{23ce12ea-204d-4bc0-a83f-47315f76a212}</UniqueIdentifier>
+      <UniqueIdentifier>{71ab2045-01c0-482a-9c81-3f39b285a4ee}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\GB">
-      <UniqueIdentifier>{f336c3ae-261f-4873-b062-9e05d7afca09}</UniqueIdentifier>
+      <UniqueIdentifier>{6cb20f6a-afd1-4ccd-a926-3834889bae84}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\GB APU">
-      <UniqueIdentifier>{1b3555ff-9bdf-457d-bc01-6e94a256278a}</UniqueIdentifier>
+      <UniqueIdentifier>{2f992f65-e7e8-48bc-a7f5-774edb9e62f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Core\GBA">
-      <UniqueIdentifier>{da309579-ba11-4082-93e3-4d29e387488a}</UniqueIdentifier>
+      <UniqueIdentifier>{9eaca194-71f6-4e10-86d5-b94e05fd3f10}</UniqueIdentifier>
     </Filter>
     <Filter Include="Documentation">
-      <UniqueIdentifier>{c1844500-2572-4250-9be1-f4969fabc48e}</UniqueIdentifier>
+      <UniqueIdentifier>{52d0aca8-f8f2-41d1-a67d-bfa4e4e99d94}</UniqueIdentifier>
     </Filter>
     <Filter Include="Functionality">
-      <UniqueIdentifier>{5419645c-6723-460f-b8e0-5be4b634f584}</UniqueIdentifier>
+      <UniqueIdentifier>{ef1d7bb9-f2d2-496e-9549-25583f04f3c4}</UniqueIdentifier>
     </Filter>
     <Filter Include="IO">
-      <UniqueIdentifier>{2988ee4b-39c4-4fbe-af69-4daec52c6c63}</UniqueIdentifier>
+      <UniqueIdentifier>{6d57ec3d-8b19-4d80-8221-b803b2edb7aa}</UniqueIdentifier>
     </Filter>
     <Filter Include="Linking">
-      <UniqueIdentifier>{a5da88a7-5785-46a5-b2a8-487225ac69c8}</UniqueIdentifier>
+      <UniqueIdentifier>{7e4bd18a-5c40-46e3-b05d-1eee558c4ab2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Main">
-      <UniqueIdentifier>{70f0fedd-e7dc-4911-a89e-d9ebe7a3f670}</UniqueIdentifier>
+      <UniqueIdentifier>{ecb2dede-5ec7-485d-a7a6-b3489d0e504b}</UniqueIdentifier>
     </Filter>
     <Filter Include="MFC">
-      <UniqueIdentifier>{dc5878f6-fc7f-4ab8-a261-4232514170ef}</UniqueIdentifier>
+      <UniqueIdentifier>{09851216-fb4c-4f6a-81ae-5ec46f04e6fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="MFC\GB">
-      <UniqueIdentifier>{18f82a90-19b8-4ee0-bf11-21ae39aaa799}</UniqueIdentifier>
+      <UniqueIdentifier>{265d5ac0-3209-44e4-b09f-8354ea4839c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Pixel Filter">
-      <UniqueIdentifier>{3c8217d7-3e96-48f3-8039-a4df5b6186e5}</UniqueIdentifier>
+      <UniqueIdentifier>{4d6fc79c-afbf-418c-a41a-163a37de1c07}</UniqueIdentifier>
     </Filter>
     <Filter Include="Pixel Filter\HQ">
-      <UniqueIdentifier>{90711076-20e5-4e32-8fb2-4d7255223277}</UniqueIdentifier>
+      <UniqueIdentifier>{da4006a7-9edf-441d-9b6f-68e10c67c23c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Pixel Filter\HQ\3x_4x_asm">
-      <UniqueIdentifier>{c3dc4558-ae69-42d0-af12-1bd9e4ebbe18}</UniqueIdentifier>
+      <UniqueIdentifier>{8a72efc9-f324-4d65-a877-74026352ae70}</UniqueIdentifier>
     </Filter>
     <Filter Include="Resource">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
@@ -124,9 +124,6 @@
     <ClInclude Include="..\..\src\gba\GBAcpu.h">
       <Filter>Core\GBA</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\gba\gbafilter.h">
-      <Filter>Core\GBA</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\gba\gbagfx.h">
       <Filter>Core\GBA</Filter>
     </ClInclude>