Merge pull request #120 from gnott/tweaks

Tweaks