more validation changes