small improvements to the 'Charger'