various edits
fixed merge conflicts