more validation updates