fix and validations