add many new comments and fix quoting