Minor Changes and Cleanup

also suppressed a bunch of stuff
I'm kind of like a dictator now