Oh, and definitely make sure the battery contacts aren't corroded/had leaky batteries, though if you're gonna swap it for a rechargeable one, it may not matter?
Battery upgrade is definitely on the table probably a usb-c. it was verified working though from the shop. Unsure where to get the kits though and what a reasonable price is for a kit.