Miscellaneous edits and fixes.