fixing all the broken things