fixing all the stuff I broke