Slowly fixing all of the things