amuuu fix a bunch of bugs