fixing all the stupid broken things