Update notes for submitted changes

* Move some template validation to Template class