fixes, move validator in

move validator