merge all new changes for coin control and other fixes