diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx
index c427e140d..c0b6d516f 100644
--- a/source/GameOverSubstate.hx
+++ b/source/GameOverSubstate.hx
@@ -23,10 +23,7 @@ class GameOverSubstate extends MusicBeatSubstate
 		var daBf:String = '';
 		switch (daStage)
 		{
-			case 'school':
-				stageSuffix = '-pixel';
-				daBf = 'bf-pixel-dead';
-			case 'schoolEvil':
+			case 'school' | 'schoolEvil':
 				stageSuffix = '-pixel';
 				daBf = 'bf-pixel-dead';
 			default:
@@ -92,6 +89,11 @@ class GameOverSubstate extends MusicBeatSubstate
 				FlxG.switchState(new FreeplayState());
 		}
 
+		#if debug
+		if (FlxG.keys.justPressed.EIGHT)
+			FlxG.switchState(new AnimationDebug(bf.curCharacter));
+		#end
+
 		if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.curFrame == 12)
 		{
 			FlxG.camera.follow(camFollow, LOCKON, 0.01);
diff --git a/source/PlayState.hx b/source/PlayState.hx
index ea6243cfe..d09d83dd1 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -931,6 +931,8 @@ class PlayState extends MusicBeatState
 
 	function ughIntro()
 	{
+		inCutscene = true;
+
 		FlxG.sound.playMusic(Paths.music('DISTORTO'), 0);
 		FlxG.sound.music.fadeIn(5, 0, 0.5);
 
@@ -960,7 +962,9 @@ class PlayState extends MusicBeatState
 			{
 				boyfriend.playAnim('singUP');
 				// play sound
-				FlxG.sound.play(Paths.sound('bfBeep'));
+				FlxG.sound.play(Paths.sound('bfBeep'), function() {
+					boyfriend.playAnim('idle');
+				});
 			});
 
 			new FlxTimer().start(3, function(swaggy:FlxTimer)
@@ -993,6 +997,8 @@ class PlayState extends MusicBeatState
 
 	function gunsIntro()
 	{
+		inCutscene = true;
+
 		camFollow.setPosition(camPos.x, camPos.y);
 
 		camHUD.visible = false;
@@ -1051,6 +1057,8 @@ class PlayState extends MusicBeatState
 
 	function stressIntro()
 	{
+		inCutscene = true;
+
 		// for story mode shit
 		camFollow.setPosition(camPos.x, camPos.y);
 
@@ -1402,8 +1410,6 @@ class PlayState extends MusicBeatState
 
 	function startCountdown():Void
 	{
-		gf.visible = true;
-
 		inCutscene = false;
 
 		generateStaticArrows(0);
@@ -1996,7 +2002,12 @@ class PlayState extends MusicBeatState
 
 		#if debug
 		if (FlxG.keys.justPressed.EIGHT)
-			FlxG.switchState(new AnimationDebug(SONG.player2));
+		{
+			if (FlxG.keys.pressed.SHIFT)
+				FlxG.switchState(new AnimationDebug(SONG.player1));
+			else
+				FlxG.switchState(new AnimationDebug(SONG.player2));
+		}
 		#end
 
 		if (generatedMusic && SONG.notes[Std.int(curStep / 16)] != null)