Minor bug fix, plus examples in template.