t658 applied rudimentary formatting--column width and wrapped columns nessary
Merge branch 't658' into resolved