cosmetic
adding fitted battery model
misc bug fixes