You mention that the power connector is held in place by two screws. Would it be possible to add an arrow or circle to the picture showing where the screws are?

Also there is a surface mounted switch on the main board just above the battery on the left as viewed from the rear. Do you know what it is for? Disabling battery maybe?