various edits and clarifications