Cosmetic tweaks and an update to the upgrade notes.