Some small changes as I go.

see commit log.