Various edits based on feedback and another re-read.