fixed all validation errors