Minor __str__ enhancements
Merge remote-tracking branch 'origin/addword_template' into addword_template