Miscellaneous edits