AvdP - Fixed battery persistence!!

Woohooo!
otw - Merged changes from AlexConnectionFixing.