added a correct data validation
small amendments