Miscellaneous clean-up and some minor display wording changes.