The next OTA (which should pass QA next week) is going to make battery a significantly better, fwiw.