few small bugfixes
Merge pull request #5 from oreillymedia/sarah

small fixes