minor text edits, and renaming.