various edits

also testing git pull