Misc edits and changes.