Adds some comments and a tiny bit of refatoring.
Expands the templates and vocabulary.