fixed all the broken stuff