change validation code a little, nothing major