I'll try some more experiments with moving the deck gun around, and see if that interferes with the other equipment also... It seems that moving the gun puts something in the Save folder that then comes back and bites later when doing other changes - but not always...