some changes
review and changes against the validator