diff --git a/TODO.md b/TODO.md
index e5dc40d8..a8533cb8 100644
--- a/TODO.md
+++ b/TODO.md
@@ -14,24 +14,29 @@
 	- [x] Cap zoom in & out
 	- [x] Events (including Camera Movement)
 	- [x] Metadata Editing
-	- [ ] Custom Notes
+	- [ ] Custom Notetypes
 	- [ ] Step based zooming
+	- [ ] Bug fixes
+		- [ ] Zooming in causing notes to disappear
+		- [ ] Holds disappear too early
+		- [ ] Time signature fixes
+	- [ ] Optimization
 - [ ] Character Editor
 	- [ ] Change ghost anim
 	- [ ] Make gf characters be positioned correctly
 	- [ ] Make it so dragging the character moves the offset
 	- [ ] Disable volume controls when selecting stuff
-- [ ] Use latest hxCodec
+- [x] Use latest hxCodec
 - [ ] Re-export gf-christmas, gf-car and gf-tankmen with padding
 - [ ] Multiple state scripts & Multiple global scripts
 - [x] Re-add shader camera stuff
-- [ ] Make update.bat use libs.xml instead of hmm.json
+- [x] Make update.bat use libs.xml instead of hmm.json
 - [ ] New Switch Mod menu
 - [x] Port shader camera stuff over to new flixel fork
 - [ ] Add note offset
 - [ ] Dialogue
 - [ ] Finish Base Game port
-- [ ] Add credits
+- [x] Add credits
 - [ ] Verbose mode (`--verbose`)
 - [ ] Tooltips
 - [ ] Fix bugs
@@ -44,6 +49,6 @@
 	- [ ] Statics on Custom Classes
 	- [ ] Fix Bugs
 - [ ] Full 3D support via stages files
-- [ ] Multithread sprites loading (for faster load times) ?
+- [ ] Multithread sprites and assets loading (for faster load times) ?
 - [ ] Stage Editor
 - [ ] Optimize flxanimate isOnScreen
\ No newline at end of file
diff --git a/source/funkin/editors/charter/CharterNote.hx b/source/funkin/editors/charter/CharterNote.hx
index aec1ed7e..c5214a44 100644
--- a/source/funkin/editors/charter/CharterNote.hx
+++ b/source/funkin/editors/charter/CharterNote.hx
@@ -30,6 +30,8 @@ class CharterNote extends UISprite {
 
 		cursor = BUTTON;
 
+		//canBeHovered = false;
+
 		moves = false;
 
 		sustainSpr = new FlxSprite(10, 40);
@@ -37,7 +39,7 @@ class CharterNote extends UISprite {
 		members.push(sustainSpr);
 	}
 
-	public override function updateButton() {
+	public override function updateButtonHandler() {
 		__rect.x = x;
 		__rect.y = y;
 		__rect.width = 40;
diff --git a/source/funkin/editors/ui/UISprite.hx b/source/funkin/editors/ui/UISprite.hx
index d9fb178e..af05c73d 100644
--- a/source/funkin/editors/ui/UISprite.hx
+++ b/source/funkin/editors/ui/UISprite.hx
@@ -17,6 +17,8 @@ class UISprite extends FlxSprite {
 	public var hoveredByChild:Bool = false;
 	public var pressed:Bool = false;
 
+	public var canBeHovered:Bool = true;
+
 	public var hoverCallback:Void->Void = null;
 
 	public var cursor:MouseCursor = ARROW;
@@ -85,6 +87,16 @@ class UISprite extends FlxSprite {
 	}
 
 	public function updateButton() {
+		if(canBeHovered)
+			updateButtonHandler();
+		else {
+			if(FlxG.mouse.pressed) {
+				updateButtonHandler();
+			}
+		}
+	}
+
+	public function updateButtonHandler() {
 		UIState.state.updateButtonHandler(this, onHovered);
 	}