started fixing validation errors