fix some typos
Merge branch 'dev-chin' into development