validation updates and data bug fix
tweak