Fixed up very minor typos
Merge minor changes