fixing all but helm and circe