various edits throughout