Various suggested tweaks

I've been using these tweaks to your gem in production for a while. I figured I might as well see if you'd be interested in merging them into your official release.