Some battery and other fixes....