fixing all the thing