miscellaneous edits