Bunch of unrelated changes

Sometimes that's how I roll.
Yep