Take Daniel Krügler's wording suggestions, and misc other changes.