added a few validations