minor edits and comments