fixed battery in master.

Damn, so bloody difficult :)
and made the master branch clean again. Pfew