diff --git a/VBA.vcproj b/VBA.vcproj
index 708ff873..863891ad 100644
--- a/VBA.vcproj
+++ b/VBA.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="VisualBoyAdvance"
 	ProjectGUID="{6D4C5EC8-933F-4C05-A1BF-498E658576DF}"
 	RootNamespace="VBA"
@@ -129,6 +129,115 @@
 				ExcludedFromBuild="true"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)_temp"
+			ConfigurationType="1"
+			UseOfMFC="1"
+			CharacterSet="2"
+			BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				ExcludedFromBuild="true"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="false"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng;&quot;..\dependencies\File_Extractor-0.4.2\fex&quot;;..\dependencies\cximage;..\dependencies\msvc"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;C_CORE"
+				StringPooling="false"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="false"
+				RuntimeLibrary="1"
+				StructMemberAlignment="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				EnableEnhancedInstructionSet="0"
+				TreatWChar_tAsBuiltInType="false"
+				UsePrecompiledHeader="0"
+				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories=""
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				ExcludedFromBuild="true"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="nafxcwd.lib LIBCMTD.lib Vfw32.Lib OpenGL32.Lib dinput8.lib dxguid.lib ddraw.lib winmm.lib Dsound.lib"
+				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
+				Version=""
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateManifest="true"
+				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;amd64&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
+				IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="1"
+				EnableCOMDATFolding="1"
+				OptimizeForWindows98="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				ExcludedFromBuild="true"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
@@ -251,115 +360,6 @@
 				ExcludedFromBuild="true"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)_temp"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			CharacterSet="2"
-			BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\dependencies\zlib;..\dependencies\libpng;&quot;..\dependencies\File_Extractor-0.4.2\fex&quot;;..\dependencies\cximage;..\dependencies\msvc"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;DEV_VERSION;BKPT_SUPPORT;CRT_SECURE_NO_WARNINGS;HAS_FILE_EXTRACTOR;C_CORE"
-				StringPooling="false"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="false"
-				RuntimeLibrary="1"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				EnableEnhancedInstructionSet="0"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories=""
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="nafxcwd.lib LIBCMTD.lib Vfw32.Lib OpenGL32.Lib dinput8.lib dxguid.lib ddraw.lib winmm.lib Dsound.lib"
-				OutputFile="$(OutDir)\VisualBoyAdvance.exe"
-				Version=""
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				GenerateManifest="true"
-				AdditionalManifestDependencies="type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; processorArchitecture=&apos;amd64&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos;"
-				IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="1"
-				EnableCOMDATFolding="1"
-				OptimizeForWindows98="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
@@ -528,6 +528,16 @@
 							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 						/>
 					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCustomBuildTool"
+							Description="Assembling $(InputFileName)..."
+							CommandLine="nasm -d__DJGPP__ -O1 -fwin64 -g -Xvc -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|Win32"
 						>
@@ -538,23 +548,13 @@
 							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 						/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|x64"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -d__DJGPP__ -O1 -fwin64 -g -Xvc -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;"
-							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-						/>
-					</FileConfiguration>
 					<FileConfiguration
 						Name="Release|x64"
 						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembling $(InputFileName)..."
-							CommandLine="nasm -d__DJGPP__ -O1 -fwin64 -Xvc -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;"
+							CommandLine="nasm -d__DJGPP__ -O1 -fwin64 -Xvc -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 							Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 						/>
 					</FileConfiguration>
@@ -623,6 +623,16 @@
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|x64"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+								Description="Assembling $(InputFileName)..."
+								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+							/>
+						</FileConfiguration>
 						<FileConfiguration
 							Name="Release|Win32"
 							>
@@ -633,23 +643,13 @@
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
 						<FileConfiguration
 							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCustomBuildTool"
 								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;"
+								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
@@ -667,6 +667,16 @@
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|x64"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+								Description="Assembling $(InputFileName)..."
+								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+							/>
+						</FileConfiguration>
 						<FileConfiguration
 							Name="Release|Win32"
 							>
@@ -677,23 +687,13 @@
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
 						<FileConfiguration
 							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCustomBuildTool"
 								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;"
+								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
@@ -711,6 +711,16 @@
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|x64"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+								Description="Assembling $(InputFileName)..."
+								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+							/>
+						</FileConfiguration>
 						<FileConfiguration
 							Name="Release|Win32"
 							>
@@ -721,23 +731,13 @@
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
 						<FileConfiguration
 							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCustomBuildTool"
 								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;"
+								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
@@ -755,6 +755,16 @@
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|x64"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+								Description="Assembling $(InputFileName)..."
+								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
+							/>
+						</FileConfiguration>
 						<FileConfiguration
 							Name="Release|Win32"
 							>
@@ -765,23 +775,13 @@
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|x64"
-							>
-							<Tool
-								Name="VCCustomBuildTool"
-								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -g -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;"
-								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
-							/>
-						</FileConfiguration>
 						<FileConfiguration
 							Name="Release|x64"
 							>
 							<Tool
 								Name="VCCustomBuildTool"
 								Description="Assembling $(InputFileName)..."
-								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;"
+								CommandLine="nasm -O1 -isrc/ -fwin64 -Xvc -w-orphan-labels -o&quot;$(IntDir)\$(InputName).obj&quot; -- &quot;$(InputPath)&quot;&#x0D;&#x0A;"
 								Outputs="&quot;$(IntDir)\$(InputName).obj&quot;"
 							/>
 						</FileConfiguration>
@@ -1018,42 +1018,18 @@
 				<Filter
 					Name="GB APU"
 					>
-					<File
-						RelativePath=".\src\gb\gb_apu\blargg_common.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\gb\gb_apu\blargg_config.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\gb\gb_apu\blargg_source.h"
-						>
-					</File>
 					<File
 						RelativePath=".\src\gb\gb_apu\Blip_Buffer.cpp"
 						>
 					</File>
-					<File
-						RelativePath=".\src\gb\gb_apu\Blip_Buffer.h"
-						>
-					</File>
 					<File
 						RelativePath=".\src\gb\gb_apu\Effects_Buffer.cpp"
 						>
 					</File>
-					<File
-						RelativePath=".\src\gb\gb_apu\Effects_Buffer.h"
-						>
-					</File>
 					<File
 						RelativePath=".\src\gb\gb_apu\Gb_Apu.cpp"
 						>
 					</File>
-					<File
-						RelativePath=".\src\gb\gb_apu\Gb_Apu.h"
-						>
-					</File>
 					<File
 						RelativePath=".\src\gb\gb_apu\Gb_Apu_State.cpp"
 						>
@@ -1062,18 +1038,10 @@
 						RelativePath=".\src\gb\gb_apu\Gb_Oscs.cpp"
 						>
 					</File>
-					<File
-						RelativePath=".\src\gb\gb_apu\Gb_Oscs.h"
-						>
-					</File>
 					<File
 						RelativePath=".\src\gb\gb_apu\Multi_Buffer.cpp"
 						>
 					</File>
-					<File
-						RelativePath=".\src\gb\gb_apu\Multi_Buffer.h"
-						>
-					</File>
 				</Filter>
 			</Filter>
 			<Filter
@@ -1387,7 +1355,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1395,7 +1363,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -1411,6 +1379,10 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath=".\src\win32\LoadOAL.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\win32\OpenAL.cpp"
 					>
@@ -1485,6 +1457,42 @@
 					RelativePath=".\src\gb\gbSound.h"
 					>
 				</File>
+				<Filter
+					Name="GB APU"
+					>
+					<File
+						RelativePath=".\src\gb\gb_apu\blargg_common.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gb\gb_apu\blargg_config.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gb\gb_apu\blargg_source.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gb\gb_apu\Blip_Buffer.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gb\gb_apu\Effects_Buffer.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gb\gb_apu\Gb_Apu.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gb\gb_apu\Gb_Oscs.h"
+						>
+					</File>
+					<File
+						RelativePath=".\src\gb\gb_apu\Multi_Buffer.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="Filters"
@@ -1873,6 +1881,10 @@
 					RelativePath=".\src\win32\Input.h"
 					>
 				</File>
+				<File
+					RelativePath=".\src\win32\LoadOAL.h"
+					>
+				</File>
 				<File
 					RelativePath=".\src\win32\Sound.h"
 					>