better support for battery
big work for the GUI