document additional changes
sync with master branch
fix spelling errors