Charging was intermittent and battery runs out fast - now all good with the replacement parts.
Doing both of these at the same time is a good idea. Good parts, good repair.
I grabbed a BIG local business advertisement magnet from my fridge and used that up side down for all of the screws and parts. There are FAR more than you might think AND they are TINY! Go slow and thorough, try to fit the new parts without the stickers to check fit and placement (especially the battery.) Having a jewelers loop might be beneficial for anyone who's not strongly myopic. I used a heat gun to slowly soften the glue around the battery - go slow. I also used dental floss and wrapped each end around my small screw drivers to pull under the battery slowly. Took a while, just move slow.