Updated
Fixed some validations