miscellaneous fixes
Merge pull request #41 from nphillips/master

miscellaneous fixes