Fix minor typos. 

This is largely for me to get into the workflow of working on a larger OS project.
Resolve erge conflicts