A bunch of changes here to address Gary's comments.

2019-08-21, John Bailey