Fix typos and re-arrange some text.