fix for some typo and comments