Update notes for submitted changes

* Improve functional comments and add TODO points