Fix a bunch of mistakes
Merge pull request #5 from kapman/master

Fix a bunch of mistakes