Miscellaneous updates

I'm planning to spend some more time updating this in the coming months. For now this is a pull request with the results of my slow chipping away at it last year.