Adding minor comment changes so this can be reviewed.

This code is being put into gerrithub for review, please don't merge directly.