Fixed BIG derp, cleanups.