Additions and stylistic changes.

See the individual git changelogs 

BTW: do you prefer these github pull request things or would you be just as happy with `git format-patch` patches?