Update notes for submitted changes

* Mark TODOs and modify some comments