fix some typos
merge