a few final fixes from Stefan
Merge pull request #2 from jarrodmillman/master

from Stefan