small fix
more validation updates