some validation changes