Update some things, fix some minor things...

Yay for pull requests!
Commit descriptions in individual commits.