Validations

Validations and comments