fixed all of the errors