a few misc. edits