Validation

FIxed validation errors