more validation corrections
more validation corrections