Update notes for submitted changes

* Fix cleanup, implement minor fixes