Update notes for submitted changes

* Fix bug 3011 which was introduced because of a merge error. Also fixed some flake8 issues