diff --git a/assets/preload/data/funnyTips.txt b/assets/preload/data/funnyTips.txt
index ec76df93286..3d041a8e047 100644
--- a/assets/preload/data/funnyTips.txt
+++ b/assets/preload/data/funnyTips.txt
@@ -96,8 +96,9 @@ If your game is lagging, try changing "Anti-Aliasing" to false
 If your game is lagging, try closing some process in your peecee
 If your game is lagging, just buy a new pc!
 Jordan when added buldi JSE 1.38.0 Jordan
+JS Engine is mentioned in the Funkipedia Mods Wiki exactly 7 times.
 meow meow nya~ :3
 *explodes from karim's patpat*
 Lily's here!!! mnya :3
 yo really think so?
-gay sex
\ No newline at end of file
+gay sex
diff --git a/source/Note.hx b/source/Note.hx
index cd266701dc9..0ec068a363a 100644
--- a/source/Note.hx
+++ b/source/Note.hx
@@ -529,7 +529,6 @@ class Note extends FlxSprite
 			case 'Rainbow':
 			var superCoolColor = new FlxColor(0xFFFF0000);
 			superCoolColor.hue = (strumTime / 5000 * 360) % 360;
-			var coolDarkColor = superCoolColor;
 			rgbShader.r = superCoolColor;
 			rgbShader.g = FlxColor.WHITE;
 			rgbShader.b = superCoolColor.getDarkened(0.7);
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 4b4bd12b424..ec1a5721adc 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -358,10 +358,6 @@ class PlayState extends MusicBeatState
 	public var songHits:Int = 0;
 	public var songMisses:Float = 0;
 	public var scoreTxt:FlxText;
-	var comboTxt:FlxText;
-	var missTxt:FlxText;
-	var accuracyTxt:FlxText;
-	var npsTxt:FlxText;
 	var timeTxt:FlxText;
 
 	var hitTxt:FlxText;
@@ -1358,7 +1354,7 @@ class PlayState extends MusicBeatState
 				EngineWatermark.text = "JS Engine v" + MainMenuState.psychEngineJSVersion;
 				EngineWatermark.x = FlxG.width - EngineWatermark.width - 5;
 			case 'JS Engine': 
-				if (!ClientPrefs.downScroll) EngineWatermark.y = FlxG.height * 0.1 + 50;
+				if (!ClientPrefs.downScroll) EngineWatermark.y = FlxG.height * 0.1 - 70;
 				EngineWatermark.text = "Playing " + SONG.song + " on " + CoolUtil.difficultyString() + " - JSE v" + MainMenuState.psychEngineJSVersion;
 			case 'Dave Engine':
 				EngineWatermark.setFormat(Paths.font("comic.ttf"), 16, FlxColor.WHITE, RIGHT, OUTLINE,FlxColor.BLACK);
@@ -1541,7 +1537,7 @@ class PlayState extends MusicBeatState
 		iconP2.cameras = [camHUD];
 		if (EngineWatermark != null) EngineWatermark.cameras = [camHUD];
 		judgementCounter.cameras = [camHUD];
-		scoreTxt.cameras = [camHUD];
+		if (scoreTxt != null) scoreTxt.cameras = [camHUD];
 		if (botplayTxt != null) botplayTxt.cameras = [camHUD];
 		timeBar.cameras = [camHUD];
 		timeBarBG.cameras = [camHUD];
@@ -2498,6 +2494,9 @@ class PlayState extends MusicBeatState
 		}
 	}
 
+	var comboInfo = ClientPrefs.showComboInfo;
+	var showNPS = ClientPrefs.showNPS;
+	var missString:String = '';
 	public function updateScore(miss:Bool = false)
 	{
 		scoreTxtUpdateFrame++;
@@ -2515,37 +2514,41 @@ class PlayState extends MusicBeatState
 		formattedCombo = formatNumber(combo);
 		formattedNPS = formatNumber(nps);
 		formattedMaxNPS = formatNumber(maxNPS);
-		npsString = ClientPrefs.showNPS ? ' $divider ' + (cpuControlled && ClientPrefs.botWatermark ? 'Bot ' : '') + 'NPS/Max: ' + formattedNPS + '/' + formattedMaxNPS : '';
+		npsString = showNPS ? ' $divider ' + (cpuControlled && ClientPrefs.botWatermark ? 'Bot ' : '') + 'NPS/Max: ' + formattedNPS + '/' + formattedMaxNPS : '';
 		accuracy = Highscore.floorDecimal(ratingPercent * 100, 2) + '%';
 		fcString = ratingFC;
+		missString = (!instakillOnMiss ? switch(ClientPrefs.scoreStyle)
+		{
+			case 'Kade Engine', 'VS Impostor': ' $divider Combo Breaks: ' + formattedSongMisses;
+			case 'Doki Doki+': ' $divider Breaks: ' + formattedSongMisses;
+			default: 
+				' $divider Misses: ' + formattedSongMisses;
+		} : '');
 
 		botText = cpuControlled && ClientPrefs.botWatermark ? ' $divider Botplay Mode' : '';
 
 		if (cpuControlled && ClientPrefs.botWatermark)
-			tempScore = 'Bot Score: ' + formattedScore + (ClientPrefs.showComboInfo ? ' $divider Bot Combo: ' + formattedCombo : '') + npsString + botText;
+			tempScore = 'Bot Score: ' + formattedScore + (comboInfo ? ' $divider Bot Combo: ' + formattedCombo : '') + npsString + botText;
 
 		else switch (ClientPrefs.scoreStyle)
 		{
-			case 'Kade Engine':
-				tempScore = 'Score: ' + formattedScore + ' $divider Combo Breaks: ' + formattedSongMisses  + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider (' + fcString + ') ' + ratingName;
-
-			case "Doki Doki+":
-				tempScore = 'Score: ' + formattedScore + ' $divider Breaks: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider (' + fcString + ') ' + ratingName;
+			case 'Kade Engine', 'Doki Doki+':
+				tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider (' + fcString + ') ' + ratingName;
 
 			case "Dave Engine":
-				tempScore = 'Score: ' + formattedScore + ' $divider Misses: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider ' + fcString;
+				tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + accuracy + ' $divider ' + fcString;
 
 			case "Forever Engine":
-				tempScore = 'Score: ' + formattedScore + ' $divider Accuracy: ' + Highscore.floorDecimal(ratingPercent * 100, 2) + '% ['  + fcString + ']' + ' $divider Combo Breaks: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rank: ' + ratingName;
+				tempScore = 'Score: ' + formattedScore + ' $divider Accuracy: $accuracy ['  + fcString + ']' + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rank: ' + ratingName;
 
 			case "Psych Engine", "JS Engine", "TGT V4":
-				tempScore = 'Score: ' + formattedScore + ' $divider Misses: ' + formattedSongMisses  + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : '');
+				tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : '');
 
 			case "Leather Engine":
-				tempScore = '< Score: ' + formattedScore + ' $divider Misses: ' + formattedSongMisses + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : '');
+				tempScore = '< Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Rating: ' + ratingName + (ratingName != '?' ? ' (${accuracy}) - $fcString' : '');
 
 			case 'VS Impostor':
-				tempScore = 'Score: ' + formattedScore + ' $divider Combo Breaks: ' + formattedSongMisses  + (ClientPrefs.showComboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: ' + Highscore.floorDecimal(ratingPercent * 100, 2) + '% ['  + fcString + ']';
+				tempScore = 'Score: ' + formattedScore + missString + (comboInfo ? ' $divider Combo: ' + formattedCombo : '') + npsString + ' $divider Accuracy: $accuracy ['  + fcString + ']';
 
 			case 'Vanilla':
 				tempScore = 'Score: ' + formattedScore;
@@ -4975,8 +4978,15 @@ class PlayState extends MusicBeatState
 		if (ClientPrefs.songLoading) FlxG.sound.music.volume = 0;
 		if (ClientPrefs.songLoading) vocals.volume = opponentVocals.volume = 0;
 
-		FlxTransitionableState.skipNextTransOut = noTrans;
-		FlxG.resetState();
+		if(noTrans)
+		{
+			FlxTransitionableState.skipNextTransOut = true;
+			FlxG.resetState();
+		}
+		else
+		{
+			FlxG.resetState();
+		}
 	}
 
 	public var totalPlayed:Int = 0;
@@ -6440,6 +6450,8 @@ class PlayState extends MusicBeatState
 			if (SONG.notes[curSection].changeBPM)
 			{
 				Conductor.changeBPM(SONG.notes[curSection].bpm);
+				SustainSplash.startCrochet = Conductor.stepCrochet;
+				SustainSplash.frameRate = Math.floor(24 / 100 * Conductor.bpm);
 				setOnLuas('curBpm', Conductor.bpm);
 				setOnLuas('crochet', Conductor.crochet);
 				setOnLuas('stepCrochet', Conductor.stepCrochet);