Fixing bugs and all the things