fixing all the stuff