fix some typo and variable