Improvements to the Hybrid2 battery model