minor edits throughout