Fix some more typos, clean up the TODO
Merge pull request #18 from michalrus/clean-todo

Fix some more typos, clean up the TODO