Updated output

This version returns the template formatting and updates the output for
word and annotation counting.