Fix the broken things.
Merge pull request #28 from johnb30/fixes

Fixing all the broken things.