fix numerous validation problems!