validations improved