While reading I edited a bit for readability and
consistency.
Also updated some cruft that referred to old versions.