bring back stock charging mode, some other minor updates