Fixed rest of derp-commit... hopefully