Update notes for submitted changes

* Move exceptions back into one place