Blergh, one last formatting fix and a couple of edits to upgrading page.