some cleanup of issues found in testing
Merge pull request #108 from sbillard/master

some cleanup of issues found in testing