Update notes for submitted changes

* More NFC leftovers, plus some cleanup