validation improvements