A wide variety of changes

I should have separated them out, but I didn't. Deal with it.