Yet more content edits.
Merge branch 'content-work'
Minor fussing.