This suggestion is a simpler one.
Is there any way that we can use the various factories to make replacements of certain tools (e.g. Healing Beam, Pistol, Marker Beam, Sniper Rifle, Flashlight, Torch, etc.?) It would help make 'survival' scenarios a little more believable.
While we're at it...