Scott's comments and changes

This diff exactly represents Scott's changes as sent in his Feb 11 email