Fix #552
Fix #555 Charge display and update
Fix #556
Fix #554