diff --git a/Project.xml b/Project.xml
index 5c96861ac..39a318e37 100644
--- a/Project.xml
+++ b/Project.xml
@@ -120,7 +120,7 @@
 	<haxelib name="flixel-ui" />
 	<!--haxelib name="newgrounds" unless="switch"/> -->
 	<haxelib name="faxe" if='switch'/>
-	<haxelib name="polymod" if="cpp"/>
+	<haxelib name="polymod" if="desktop"/>
 	<haxelib name="firetongue" />
 	
 	<!-- <haxelib name="colyseus"/> -->
diff --git a/source/charting/ChartingState.hx b/source/charting/ChartingState.hx
index d49df61a7..d9a19e5cc 100644
--- a/source/charting/ChartingState.hx
+++ b/source/charting/ChartingState.hx
@@ -580,9 +580,17 @@ class ChartingState extends MusicBeatState
 		Conductor.songPosition = FlxG.sound.music.time;
 		_song.song = typingShit.text;
 
-		playheadTest.y = FlxMath.remapToRange(Conductor.songPosition, 0, FlxG.sound.music.length, 0, FlxG.height);
+		playheadTest.y = CoolUtil.coolLerp(playheadTest.y, FlxMath.remapToRange(Conductor.songPosition, 0, FlxG.sound.music.length, 0, FlxG.height), 0.5);
 
-		strumLine.y = getYfromStrum((Conductor.songPosition - sectionStartTime()) % (Conductor.stepCrochet * SongLoad.getSong()[curSection].lengthInSteps));
+		var strumLinePos:Float = getYfromStrum((Conductor.songPosition - sectionStartTime()) % (Conductor.stepCrochet * SongLoad.getSong()[curSection].lengthInSteps));
+
+		if (FlxG.sound.music != null)
+		{
+			if (FlxG.sound.music.playing)
+				strumLine.y = strumLinePos;
+			else
+				strumLine.y = CoolUtil.coolLerp(strumLine.y, strumLinePos, 0.5);
+		}
 
 		/* if (FlxG.sound.music.playing)
 			{
@@ -619,7 +627,7 @@ class ChartingState extends MusicBeatState
 				vocals.pause();
 			}
 
-			FlxG.sound.music.time = getStrumTime(FlxG.mouse.y) + sectionStartTime();
+			FlxG.sound.music.time = CoolUtil.coolLerp(FlxG.sound.music.time, getStrumTime(FlxG.mouse.y) + sectionStartTime(), 0.5);
 			vocals.time = FlxG.sound.music.time;
 		}
 
@@ -646,7 +654,8 @@ class ChartingState extends MusicBeatState
 						vocals.pause();
 					}
 
-					FlxG.sound.music.time = FlxMath.remapToRange(FlxG.mouse.screenY, 0, FlxG.height, 0, FlxG.sound.music.length);
+					FlxG.sound.music.time = CoolUtil.coolLerp(FlxG.sound.music.time,
+						FlxMath.remapToRange(FlxG.mouse.screenY, 0, FlxG.height, 0, FlxG.sound.music.length), 0.5);
 					vocals.time = FlxG.sound.music.time;
 				}
 				if (FlxG.mouse.justPressed)
diff --git a/source/modding/PolymodHandler.hx b/source/modding/PolymodHandler.hx
index 3d3c9bace..d43c36425 100644
--- a/source/modding/PolymodHandler.hx
+++ b/source/modding/PolymodHandler.hx
@@ -1,6 +1,7 @@
 package modding;
 
-#if cpp
+#if desktop
+import polymod.Polymod.ModMetadata;
 import polymod.Polymod;
 import polymod.backends.OpenFLBackend;
 import polymod.backends.PolymodAssets.PolymodAssetType;