Changes to XML taken in, reverted some changes

Mech still not adding ammunition consistently.  May need to re-evaluate
and check.