tweaks on validation check