Update notes for submitted changes

* refactor, cleanup and add new options