misc trivial edits