fix typo
Merge remote-tracking branch 'upstream/master'
Part 2 finished
Minor typo corrections