diff --git a/amxmodx/msvc/amxmodx_mm.vcproj b/amxmodx/msvc/amxmodx_mm.vcproj
index 3bea0e80..b78e2ade 100755
--- a/amxmodx/msvc/amxmodx_mm.vcproj
+++ b/amxmodx/msvc/amxmodx_mm.vcproj
@@ -38,22 +38,22 @@
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"
-				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amx_mm.dll
+				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amxx_mm.dll
 "
 				Outputs="$(TargetName)"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="debug/amx_mm.dll"
+				OutputFile="debug/amxx_mm.dll"
 				Version="0.1"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\debug/amx_mm.pdb"
-				ImportLibrary=".\debug/amx_mm.lib"/>
+				ProgramDatabaseFile=".\debug/amxx_mm.pdb"
+				ImportLibrary=".\debug/amxx_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"
@@ -86,7 +86,9 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
+				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_mm_EXPORTS"
 				StringPooling="TRUE"
@@ -103,20 +105,20 @@
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"
-				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amx_mm.dll
+				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amxx_mm.dll
 "
 				Outputs="$(TargetName)"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="release/amx_mm.dll"
+				OutputFile="release/amxx_mm.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
 				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\release/amx_mm.pdb"
-				ImportLibrary=".\release/amx_mm.lib"/>
+				ProgramDatabaseFile=".\release/amxx_mm.pdb"
+				ImportLibrary=".\release/amxx_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
@@ -167,22 +169,22 @@
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"
-				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amx_mm.dll
+				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amxx_mm.dll
 "
 				Outputs="$(TargetName)"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib"
-				OutputFile="memtestdebug/amx_mm.dll"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile="memtestdebug/amxx_mm.dll"
 				Version="0.1"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\debug/amx_mm.pdb"
-				ImportLibrary=".\debug/amx_mm.lib"/>
+				ProgramDatabaseFile=".\debug/amxx_mm.pdb"
+				ImportLibrary=".\debug/amxx_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"
@@ -215,7 +217,9 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
+				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_mm_EXPORTS;MEMORY_TEST"
 				StringPooling="TRUE"
@@ -232,20 +236,20 @@
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"
-				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amx_mm.dll
+				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amxx_mm.dll
 "
 				Outputs="$(TargetName)"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib"
-				OutputFile="memtestrelease/amx_mm.dll"
+				OutputFile="memtestrelease/amxx_mm.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
 				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\release/amx_mm.pdb"
-				ImportLibrary=".\release/amx_mm.lib"/>
+				ProgramDatabaseFile=".\release/amxx_mm.pdb"
+				ImportLibrary=".\release/amxx_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
@@ -296,22 +300,22 @@
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"
-				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amx_mm.dll
+				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amxx_mm.dll
 "
 				Outputs="$(TargetName)"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib"
-				OutputFile="debug/amx_mm.dll"
+				OutputFile="debug/amxx_mm.dll"
 				Version="0.1"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\debug/amx_mm.pdb"
-				ImportLibrary=".\debug/amx_mm.lib"/>
+				ProgramDatabaseFile=".\debug/amxx_mm.pdb"
+				ImportLibrary=".\debug/amxx_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"
@@ -344,7 +348,9 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
+				FavorSizeOrSpeed="1"
 				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_mm_EXPORTS;JIT"
 				StringPooling="TRUE"
@@ -361,20 +367,20 @@
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"
-				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amx_mm.dll
+				CommandLine="copy $(TargetPath) d:\Half-Life\cstrike\addons\amxx\dlls\amxx_mm.dll
 "
 				Outputs="$(TargetName)"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib"
-				OutputFile="release/amx_mm.dll"
+				OutputFile="release/amxx_mm.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
 				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\release/amx_mm.pdb"
-				ImportLibrary=".\release/amx_mm.lib"/>
+				ProgramDatabaseFile=".\release/amxx_mm.pdb"
+				ImportLibrary=".\release/amxx_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"