Bug fixing all the things