fixed all of the things