Some typo and other minor changes