fixed some validation errors...