fixing all the things!