diff --git a/NoteSkins/dance/midi-note/NoteSkin.lua b/NoteSkins/dance/midi-note/NoteSkin.lua
index 2ae3231d5f..d821c2740b 100644
--- a/NoteSkins/dance/midi-note/NoteSkin.lua
+++ b/NoteSkins/dance/midi-note/NoteSkin.lua
@@ -29,7 +29,12 @@ ret.Redir = function(sButton, sElement)
 	then
 		sElement = "Hold Head Inactive";
 	end
-
+	
+	if sElement == "Tap Fake"
+	then
+		sElement = "Tap Note";
+	end
+	
 	sButton = ret.RedirTable[sButton];
 
 	return sButton, sElement;
@@ -85,6 +90,7 @@ ret.PartsToRotate =
 	["Tap Explosion Bright"] = true,
 	["Tap Explosion Dim"] = true,
 	["Tap Note"] = true,
+	["Tap Fake"] = true,
 	["Tap Lift"] = true,
 	["Hold Head Active"] = true,
 	["Hold Head Inactive"] = true,
diff --git a/src/NoteField.h b/src/NoteField.h
index 23502eca00..560f3cb563 100644
--- a/src/NoteField.h
+++ b/src/NoteField.h
@@ -56,7 +56,7 @@ protected:
 	void DrawMarkerBar( int fBeat );
 	void DrawAreaHighlight( int iStartBeat, int iEndBeat );
 	void DrawBPMText( const float fBeat, const float fBPM );
-	void DrawFreezeText( const float fBeat, const float fBPM, const float bDelay );
+	void DrawFreezeText( const float fBeat, const float fLength, const float bDelay );
 	void DrawWarpText( const float fBeat, const float fNewBeat );
 	void DrawTimeSignatureText( const float fBeat, int iNumerator, int iDenominator );
 	void DrawTickcountText( const float fBeat, int iTicks );
diff --git a/src/StepMania-net2008.vcproj b/src/StepMania-net2008.vcproj
index 2dfb5b7eb1..fdd1456e75 100644
--- a/src/StepMania-net2008.vcproj
+++ b/src/StepMania-net2008.vcproj
@@ -6586,6 +6586,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\png.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6610,6 +6618,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngerror.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6622,6 +6638,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngget.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6642,6 +6666,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngmem.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6654,6 +6686,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngpread.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6670,6 +6710,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngread.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6682,6 +6730,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngrio.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6694,6 +6750,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngrtran.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6706,6 +6770,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngrutil.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6718,6 +6790,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngset.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6734,6 +6814,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngtrans.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6746,6 +6834,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngwio.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6758,6 +6854,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngwrite.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6770,6 +6874,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngwtran.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>
@@ -6782,6 +6894,14 @@
 				<File
 					RelativePath="..\extern\libpng\include\pngwutil.c"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
 					<FileConfiguration
 						Name="Release-SSE2|Win32"
 						>