various small fixes
Merge pull request #12 from rogpeppe/013-more-fixes

various small fixes