WAIT

one more change, this also leaks weekend 1 coming in 1.38.0 because i couldnt be bothered to take that out

source/editors/ChartingState.hx

@@ -1451,6 +1451,21 @@ class ChartingState extends MusicBeatState
 			noteTypeIntMap.set(key, noteTypeList[key]);
 			key++;
 		}
+		var notetypeFiles:Array<String> = Paths.mergeAllTextsNamed('data/' + Paths.formatToSongPath(_song.song) + '/notetypes.txt', '', true);
+		if(notetypeFiles.length > 0)
+		{
+			for (ntTyp in notetypeFiles)
+			{
+				var name:String = ntTyp.trim();
+				if(!displayNameList.contains(name))
+				{
+					displayNameList.push(name);
+					noteTypeMap.set(name, key);
+					noteTypeIntMap.set(key, name);
+					key++;
+				}
+			}
+		}
 
 		#if LUA_ALLOWED
 		var directories:Array<String> = [];
@@ -4140,6 +4155,7 @@ class ChartingState extends MusicBeatState
 			undos.splice(0, 1);
 			trace("Performed an Undo! Undos remaining: " + undos.length);
 			if (!unsavedChanges) unsavedChanges = true;
+			if (curSection > _song.notes.length) changeSection(_song.notes.length-1);
 			updateGrid();
 		}
     }