more validation tweaking