fixing all the messes