Completion of Review Comment Updates

Completion of review comment updates.  Ready for the next round of
comments.