fix some typos
merge from master