* commit '0d5af3f67bdd3734304a19dad45d995e93b6e957': Minor typos, consistency things, one grammatical error.