Some typos fixed

And minor changes
Merge pull request #2 from JJ/master

Some typos fixed