More work on comment, and comment team.