Thanks for playing! Took me more than a day!
And you're correct. Rooms with collectibles have been set to be persistent in order to remove the possibility of collecting the same piece multiple times. This affects all objects, hence why the blocks don't go back to their original positions. I didn't realize the battery could be moved into a no-return position, though! Most decisions were made in the spur of the moment, hence various issues.
Fun that you retried and succeeded in round two!