fixed upgrade bug and another bug - issue was in not deepcopying the canSettle