Cleanup, terminology, additional links
Merge pull request #1 from kscanne/template-fix

Cleanup, terminology, additional links