language and validation changes

language and validation changes