Update notes for submitted changes

* General template cleanup