battery fixes from invisiblek