Battery Friend: Patches, fixes and merge from remote