Added validation for comments and names