i think i fixed all the broken things