Multiple editorial improvements

No match.