various edits