typo fixes
merging