Fix typos and some bugs
Merge pull request #18 from ruffnote/typo

Fix typos and some bugs