Revisions from Steve's feedback.
More tweaks from Steve's feedback.