Update notes for submitted changes

* Update MAP code from upstream.