Add comments and minor edits