fixed all the stuff