Tweaks

In the spirit of FOSS, I humbly request that you pull these commits into your master branch...