fix some validation things...