Merge "Typos and stylistic fixes."