fixed all the errors