Various subtle improvements to the charge meter.