Tweaks.
Merge pull request #1 from larz0/master

Tweaks.