use this keyword
fix some typos and adjust some types