diff --git a/SpaceCadetPinball/Sound.cpp b/SpaceCadetPinball/Sound.cpp
index 0225bec..acdf672 100644
--- a/SpaceCadetPinball/Sound.cpp
+++ b/SpaceCadetPinball/Sound.cpp
@@ -114,10 +114,10 @@ void Sound::Enable(int channelFrom, int channelTo, int enableFlag)
 	}
 }
 
-void Sound::Idle()
+void Sound::Idle(bool performCleanup)
 {
 	if (pMem)
-		WaveMix::Pump();
+		WaveMix::Pump(performCleanup);
 }
 
 void Sound::Activate()
diff --git a/SpaceCadetPinball/Sound.h b/SpaceCadetPinball/Sound.h
index c599fe5..f8dbf48 100644
--- a/SpaceCadetPinball/Sound.h
+++ b/SpaceCadetPinball/Sound.h
@@ -6,7 +6,7 @@ class Sound
 public:
 	static int Init(HINSTANCE hInstance, int voices, void (* someFuncPtr)(int, MIXWAVE*, int));
 	static void Enable(int channelFrom, int channelTo, int enableFlag);
-	static void Idle();
+	static void Idle(bool performCleanup = true);
 	static void Activate();
 	static void Deactivate();
 	static void Close();
diff --git a/SpaceCadetPinball/SpaceCadetPinball.vcxproj b/SpaceCadetPinball/SpaceCadetPinball.vcxproj
index 5333673..d8a8e76 100644
--- a/SpaceCadetPinball/SpaceCadetPinball.vcxproj
+++ b/SpaceCadetPinball/SpaceCadetPinball.vcxproj
@@ -308,6 +308,8 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -350,6 +352,8 @@
       <ConformanceMode>false</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -392,6 +396,8 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -434,6 +440,8 @@
       <ConformanceMode>false</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/SpaceCadetPinball/WaveMix.cpp b/SpaceCadetPinball/WaveMix.cpp
index e07524c..fae0da6 100644
--- a/SpaceCadetPinball/WaveMix.cpp
+++ b/SpaceCadetPinball/WaveMix.cpp
@@ -550,7 +550,7 @@ int WaveMix::Activate(HANDLE hMixSession, bool fActivate)
 	return 0;
 }
 
-void WaveMix::Pump()
+void WaveMix::Pump(bool performCleanup)
 {
 	Globals = GlobalsActive;
 	if (GlobalsActive)
@@ -567,7 +567,8 @@ void WaveMix::Pump()
 			else
 				xHDR = xHDR->QNext;
 		}
-		FreePlayedBlocks();
+		if (performCleanup)
+			FreePlayedBlocks();
 		while (MixerPlay(GetWaveBlock(), 1));
 	}
 }
@@ -1382,12 +1383,12 @@ int WaveMix::GetConfig(HANDLE hMixSession, MIXCONFIG* lpConfig)
 
 unsigned WaveMix::MyWaveOutGetPosition(HWAVEOUT hWaveOut, int fGoodGetPos)
 {
-	mmtime_tag pmmt{};
+	MMTIME pmmt{};
 
 	if (!fGoodGetPos)
 		return (timeGetTime() - Globals->dwBaseTime) * Globals->PCM.wf.nAvgBytesPerSec / 0x3E8 & 0xFFFFFFF8;
 	pmmt.wType = TIME_BYTES;
-	waveOutGetPosition(hWaveOut, &pmmt, 0xCu);
+	waveOutGetPosition(hWaveOut, &pmmt, sizeof(MMTIME));
 	return Globals->pfnSampleAdjust(pmmt.u.ms, Globals->dwWaveOutPos);
 }
 
diff --git a/SpaceCadetPinball/WaveMix.h b/SpaceCadetPinball/WaveMix.h
index d089938..78dae28 100644
--- a/SpaceCadetPinball/WaveMix.h
+++ b/SpaceCadetPinball/WaveMix.h
@@ -151,7 +151,7 @@ public:
 	static MIXWAVE* OpenWave(HANDLE hMixSession, LPCSTR szWaveFilename, HINSTANCE hInst, unsigned int dwFlags);
 	static int FreeWave(HANDLE hMixSession, MIXWAVE* lpMixWave);
 	static int Activate(HANDLE hMixSession, bool fActivate);
-	static void Pump();
+	static void Pump(bool performCleanup = true);
 	static int Play(MIXPLAYPARAMS* lpMixPlayParams);
 
 private:
diff --git a/SpaceCadetPinball/winmain.cpp b/SpaceCadetPinball/winmain.cpp
index 688f5f5..661b17b 100644
--- a/SpaceCadetPinball/winmain.cpp
+++ b/SpaceCadetPinball/winmain.cpp
@@ -228,9 +228,10 @@ int winmain::WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 	float sleepRemainder = 0, frameDuration = TargetFrameTime;
 	while (true)
 	{
-		if (!someTimeCounter)
+		if (someTimeCounter == 0)
 		{
 			someTimeCounter = 300;
+
 			if (DispFrameRate)
 			{
 				auto curTime = timeGetTime();
@@ -257,7 +258,10 @@ int winmain::WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 			}
 		}
 
-		Sound::Idle();
+		// Don't look for and free already played blocks at every single frame,
+		// as it is quite costly to look up. Only do that "sometimes".
+		bool performSoundCleanup = someTimeCounter == 300;
+		Sound::Idle(performSoundCleanup);
 		if (!ProcessWindowMessages() || bQuit)
 			break;
 
@@ -286,25 +290,20 @@ int winmain::WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 				if (DispGRhistory)
 				{
 					auto width = render::vscreen.Width / 2;
-					auto height = 64;
+					auto height = 64, halfHeight = height / 2;
 					if (!gfr_display.BmpBufPtr1)
 					{
 						gdrv::create_bitmap(&gfr_display, width, height);
 					}
 
 					gdrv::ScrollBitmapHorizontal(&gfr_display, -1);
+					gdrv::fill_bitmap(&gfr_display, 1, halfHeight, width - 1, 0, 0); // Background
+					gdrv::fill_bitmap(&gfr_display, 1, halfHeight, width - 1, halfHeight, -1); // Target					
 
-					float target = TargetFrameTime;
-					auto scale = height / target / 2;
-					gdrv::fill_bitmap(&gfr_display, 1, height, width - 1, 0, 0); // Background
-
-					auto targetVal = dt < target ? dt : target;
-					auto targetHeight = min(static_cast<int>(std::floor(targetVal * scale)), height);
-					gdrv::fill_bitmap(&gfr_display, 1, targetHeight, width - 1, height - targetHeight, -1); // Target
-
-					auto diffVal = dt < target ? target - dt : dt - target;
-					auto diffHeight = min(static_cast<int>(std::floor(diffVal * scale)), height);
-					gdrv::fill_bitmap(&gfr_display, 1, diffHeight, width - 1, height - targetHeight - diffHeight, 1); // Target diff
+					auto scale = halfHeight / TargetFrameTime;
+					auto diffHeight = min(static_cast<int>(std::round(std::abs(TargetFrameTime - dt) * scale)), halfHeight);
+					auto yOffset = dt < TargetFrameTime ? halfHeight : halfHeight - diffHeight;
+					gdrv::fill_bitmap(&gfr_display, 1, diffHeight, width - 1, yOffset, 1); // Target diff
 
 					gdrv::blit(&gfr_display, 0, 0, render::vscreen.Width - width, 0, width, height);
 				}