True facts: XML cares about the order of the code. Actually fixed battery charging stuff and tweaked noncharging battery levels slightly

Change-Id: I252c33ddd2bedaef008b31a51be470df32faebf9