several surgery fixes