Merge pull request #1 from latortuga/tweaks

Tweaks