some more issues found in testing
Merge pull request #59 from sbillard/master

some more issues found in testing