minor improvements
Merge pull request #220 from patriot1burke/master

minor improvements