comments and minor edits