misc edits