lots of fixes
Merge pull request #11 from rogpeppe/011-fixes

lots of fixes