small tweaks and fixes
Merge pull request #15 from alexm/small-fixes

small tweaks and fixes