Fix typos, plus other edits