fix typos and clean up TODOs
Merge pull request #3 from changoinc/develop

fix typos and clean up TODOs