Validation fixed
Some comments fix