Validation errors fix
Added comments in code