Fix typos and improve some wording