Update notes for submitted changes

* Unbreak and refactor error messages