Bunch of Stuff™ 2.0 release candidate 1

now on a different branch called "maxter" because mbaxter asked me to do changes that required a force push to master and that feels dirty.