Minor edits in several places.