After several charge - discharge cycles I seem to be back on track. As for the Android OS eating up my battery, the factory reset did the trick. It is running as it did before,  <12% instead of the >50% I was seeing when it was acting up.