too much stuff

fix validator