A bunch of incremental changes.

I probably should have pushed each of these earlier, I'll figure it out eventually.