fixed all the things