various edits and fixes