cleaned up, added charging indicator