a few small fixes
Merge pull request #124 from wriley/pull-121-fixes

a few small fixes