Fixing bugs and shit