improved validations
deletions