Quick update, cleanup and fix, now it kinda works again