more validation fixing..