Some typo and var fixes