fixed all of the pr issues