Fix typo in comments.
Finish merging pull request