Last round of feedback. This version to be submitted.

Some more proofreading, feedback from Steve and Maria, captured issues
from a couple of open email conversations.