add validation and comments for teams