improved validation some more