fixing the validator, spot-checking more