fix all the things (that i broke)