diff --git a/source/funkin/editors/charter/CharterNoteGroup.hx b/source/funkin/editors/charter/CharterNoteGroup.hx
index 5898dcf8..eaa75299 100644
--- a/source/funkin/editors/charter/CharterNoteGroup.hx
+++ b/source/funkin/editors/charter/CharterNoteGroup.hx
@@ -17,13 +17,17 @@ class CharterNoteGroup extends FlxTypedGroup<CharterNote> {
 		var oldCur = __currentlyLooping;
 		__currentlyLooping = true;
 
+		var curStep = Conductor.curStepFloat;
+		if (FlxG.state is Charter && !FlxG.sound.music.playing)
+			curStep = cast(FlxG.state, Charter).conductorFollowerSpr.y / 40;
+
 		while(i < length) {
 			__loopSprite = members[i];
 			if (__loopSprite == null || !__loopSprite.exists) {
 				i++;
 				continue;
 			}
-			if (Math.abs(__loopSprite.step - Conductor.curStepFloat) - __loopSprite.susLength < max)
+			if (Math.abs(__loopSprite.step - curStep) - __loopSprite.susLength < max)
 				noteFunc(__loopSprite);
 			i++;
 		}
diff --git a/update/Update.hx b/update/Update.hx
index aba7441a..c6cba4c2 100644
--- a/update/Update.hx
+++ b/update/Update.hx
@@ -14,11 +14,14 @@ class Update {
             // install libs
             switch(lib.type) {
                 case "haxelib":
-                    prettyPrint('Installing "${lib.name}"...');             
+                    prettyPrint('Installing "${lib.name}"...');
                     Sys.command('haxelib install ${lib.name} ${lib.version != null ? " " + lib.version : " "}');
                 case "git":
                     prettyPrint('Installing "${lib.name}" from git url "${lib.url}"');
-                    Sys.command('haxelib git ${lib.name} ${lib.url}');
+					if (lib.ref != null)
+                    	Sys.command('haxelib git ${lib.name} ${lib.url} ${lib.ref}');
+					else
+                    	Sys.command('haxelib git ${lib.name} ${lib.url}');
                 default:
                     prettyPrint('Cannot resolve library of type "${lib.type}"');
             }