Update notes for submitted changes

* Cleanup exceptions a bit