fixing all the things;