CLEANed a bunch of stuff, moved some things around, whatever