Addressing the last few of Jinliang's suggestions.

Also gave it a solid read-through a editing. I think
it now just needs maybe one last look at the discussion then I am ready to send it to Tony and
hopefully submit without much further ado.

Closes #5