fixed all the errors I can find