typo fixes
minor comment
merge