work on fixing all the things