Review comments addressed.

Ready now @danfruehauf (jack russell)