fixed all of these