some small fixes
Merge pull request #179 from jaytaph/wip/smallfixes

some small fixes