cleanup and misc. edits