Big dump

Big dump of changes, no commit in a while.
Messed up a whole bunch of stuff. Worst comment ever.