fix punctuation and move some display to template