Updated validation and error messages