fixed some more validation.