diff --git a/buildnumber.txt b/buildnumber.txt
index 19afd4eb..c97fea13 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-527
\ No newline at end of file
+533
\ No newline at end of file
diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx
index 514382ab..f7d41e7d 100644
--- a/source/funkin/game/Note.hx
+++ b/source/funkin/game/Note.hx
@@ -51,6 +51,8 @@ class Note extends FlxSprite
 			prevNote = this;
 
 		this.prevNote = prevNote;
+		this.mustPress = mustPress;
+		this.noteTypeID = noteType;
 		isSustainNote = sustainNote;
 
 		x += 50;
diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx
index 50cdf063..7d019b9a 100644
--- a/source/funkin/game/PlayState.hx
+++ b/source/funkin/game/PlayState.hx
@@ -277,7 +277,7 @@ class PlayState extends MusicBeatState
 
 
 		iconP1 = new HealthIcon(boyfriend.getIcon(), true);
-		iconP2 = new HealthIcon(boyfriend.getIcon(), true);
+		iconP2 = new HealthIcon(dad.getIcon(), false);
 		for(icon in [iconP1, iconP2]) {
 			icon.y = healthBar.y - (icon.height / 2);
 			add(icon);
@@ -443,7 +443,7 @@ class PlayState extends MusicBeatState
 				var daStrumTime:Float = songNotes[0];
 				var daNoteData:Int = Std.int(songNotes[1] % 8);
 				var daNoteType:Int = Std.int(songNotes[1] / 8);
-				var gottaHitNote:Bool = songNotes[1] >= 4 ? !section.mustHitSection : section.mustHitSection;
+				var gottaHitNote:Bool = daNoteData >= 4 ? !section.mustHitSection : section.mustHitSection;
 
 				if (songNotes.length > 2) {
 					if (songNotes[3] is Int)
@@ -458,7 +458,7 @@ class PlayState extends MusicBeatState
 				else
 					swagNote = null;
 
-				swagNote = new Note(daStrumTime, daNoteData, daNoteType, gottaHitNote, swagNote);
+				swagNote = new Note(daStrumTime, daNoteData % 4, daNoteType, gottaHitNote, swagNote);
 				swagNote.sustainLength = songNotes[2];
 				swagNote.scrollFactor.set(0, 0);
 				notes.add(swagNote);
@@ -470,7 +470,7 @@ class PlayState extends MusicBeatState
 				// create sustains
 				for (susNote in 0...Math.floor(susLength))
 				{
-					swagNote = new Note(daStrumTime + (Conductor.stepCrochet * susNote), daNoteData, daNoteType, gottaHitNote, swagNote, true);
+					swagNote = new Note(daStrumTime + (Conductor.stepCrochet * susNote), daNoteData % 4, daNoteType, gottaHitNote, swagNote, true);
 					swagNote.scrollFactor.set();
 					notes.add(swagNote);
 				}
diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx
index a18375dc..cee075fd 100644
--- a/source/funkin/options/Options.hx
+++ b/source/funkin/options/Options.hx
@@ -152,6 +152,7 @@ class Options
 
 		if (!__eventAdded) {
 			Lib.application.onExit.add(function(i:Int) {
+				trace("saving settings...");
 				save();
 			});
 			__eventAdded = true;
@@ -159,7 +160,7 @@ class Options
 	}
 
 	public static function save() {
-		for(field in Reflect.fields(Options)) {
+		for(field in Type.getClassFields(Options)) {
 			var obj = Reflect.field(Options, field);
 			if (Reflect.isFunction(obj) || obj is FlxSave) continue;
 			Reflect.setField(__save.data, field, obj);