corrected some validation rules