battery fixes, location fix