Minor edits and other changes.