Fixing derps and stuff