More work on plain text.
Fix commas.