Add confim on charge and a couple of minor tweaks