Addressing some of Jinliang's suggestions.

These edits dealt with points 1 and 3 made by Jinliang in issue #5.