more validation tweaks