more misc edits