fixed more validation problems