minor edits and notation changes