Fixed pretty much everything.
Merge pull request #3 from bwl/havstuff

Fixed pretty much everything.