Minor edits getting ready for package dictionary.