Touchups in different places.
Merge pull request #25 from johnb30/touchup

Touchups in different places.