update repo to be closer to mainline