more validation improvements