updated some validations