Changes from reviewer feedback.

Thanks to the reviewers! These points definitely needed
to be clarified.