Fixes
Merge pull request #13 from mistercrunch/tweaks

Fixes