fixed a few validations