Fixing bugs and such