Minor changes for clarity/typos.
Merge