Update notes for submitted changes

* Fix some warnings and some refactoring