ALL THE THINGS

Lots and lots of stuff. Also just some OCD-ness cleanup on my part.