Merge Nelson's typo fixes.

Small typos corrected.