Some upgrade note revisions, based on feedback