Fix #544
Fix #480. Added ability Charge display.