minor typo changes
merge