Modify validation and comments.