misc. edits