More style and typo fixes.