fixing all of the errors