Fix some typo and errors