Clean up numerous entries.

26 files changed, 378 insertions, 358 deletions

diff --git a/json/items/ammo/10mm.json b/json/items/ammo/10mm.json
index 7c9c3da..3abe4c4 100644
--- a/json/items/ammo/10mm.json
+++ b/json/items/ammo/10mm.json
@@ -23,16 +23,6 @@
     "effects": [ "COOKOFF" ]
   },
   {
-    "id": "reloaded_10mm_fmj",
-    "copy-from": "10mm_fmj",
-    "type": "AMMO",
-    "name": { "str_sp": "10mm Auto FMJ, reloaded" },
-    "description": "Jacketed 10mm Auto ammunition with a 180gr bullet.  The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "bp_10mm_fmj",
     "copy-from": "10mm_fmj",
     "type": "AMMO",
@@ -46,5 +36,15 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_10mm_fmj",
+    "copy-from": "10mm_fmj",
+    "type": "AMMO",
+    "name": { "str_sp": "10mm Auto FMJ, reloaded" },
+    "description": "Jacketed 10mm Auto ammunition with a 180gr bullet.  The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/20x66mm.json b/json/items/ammo/20x66mm.json
index e5e7c1b..38caf71 100644
--- a/json/items/ammo/20x66mm.json
+++ b/json/items/ammo/20x66mm.json
@@ -4,9 +4,9 @@
     "type": "AMMO",
     "name": { "str": "20x66mm buckshot" },
     "//": "2.5x the Generic Rate of $1/shot",
-    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "A 20x66mm caseless shotgun round, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "weight": "56 g",
-    "volume": "250 ml",
+    "volume": "415 ml",
     "price": 1500,
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -28,14 +28,14 @@
     "type": "AMMO",
     "name": { "str": "20x66mm buckshot" },
     "//": "2.5x the Generic Rate of $1/shot",
-    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded."
+    "description": "A 20x66mm caseless shotgun round, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded."
   },
   {
     "id": "20x66_beanbag",
     "copy-from": "20x66_shot",
     "type": "AMMO",
     "name": { "str": "20x66mm beanbag" },
-    "description": "20x66mm caseless shotgun rounds, sublethal beanbag type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "A 20x66mm caseless shotgun round, sublethal beanbag type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 8000,
     "price_postapoc": 1000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -49,7 +49,7 @@
     "copy-from": "20x66_shot",
     "type": "AMMO",
     "name": { "str": "20x66mm flechette" },
-    "description": "20x66mm caseless shotgun rounds, flechette type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "A 20x66mm caseless shotgun round, flechette type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 4000,
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -81,7 +81,7 @@
     "copy-from": "20x66_shot_abstract",
     "type": "AMMO",
     "name": { "str": "20x66mm slug" },
-    "description": "20x66mm caseless shotgun rounds, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "A 20x66mm caseless shotgun round, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 1500,
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -108,7 +108,7 @@
     "copy-from": "20x66_shot_abstract",
     "type": "AMMO",
     "name": { "str": "20x66mm explosive" },
-    "description": "20x66mm caseless shotgun rounds, explosive projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "A 20x66mm caseless shotgun round, explosive projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 10000,
     "price_postapoc": 8000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -122,7 +122,7 @@
     "copy-from": "20x66_shot_abstract",
     "type": "AMMO",
     "name": { "str": "20x66mm flare" },
-    "description": "20x66mm caseless shotgun rounds, signal flare type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "A 20x66mm caseless shotgun round, signal flare type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 5000,
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -139,7 +139,7 @@
     "copy-from": "20x66_slug",
     "type": "AMMO",
     "name": { "str": "20x66mm frag" },
-    "description": "20x66mm caseless shotgun rounds, explosive fragmentation type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "A 20x66mm caseless shotgun round, explosive fragmentation type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 7800,
     "price_postapoc": 5000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -152,7 +152,7 @@
     "copy-from": "20x66_shot",
     "type": "AMMO",
     "name": { "str": "20x66mm incendiary", "str_pl": "20x66mm incendiaries" },
-    "description": "20x66mm caseless shotgun rounds, incendiary type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "A 20x66mm caseless shotgun round, incendiary type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 10500,
     "price_postapoc": 5000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
diff --git a/json/items/ammo/223.json b/json/items/ammo/223.json
index 977d404..2a6fd0f 100644
--- a/json/items/ammo/223.json
+++ b/json/items/ammo/223.json
@@ -2,7 +2,7 @@
   {
     "id": "223",
     "type": "AMMO",
-    "name": { "str": ".223 Remington" },
+    "name": { "str_sp": ".223 Remington" },
     "description": ".223 Remington ammunition with a 55gr FMJ-BT bullet, patterned after the M193 loading.  The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons.  The combination of high velocity with a thinly-jacketed, cannelured projectile led to unexpected yaw and fragmentation in soft tissue, increasing this round's performance.",
     "weight": "12 g",
     "volume": "194 ml",
@@ -26,7 +26,7 @@
     "id": "556",
     "copy-from": "223",
     "type": "AMMO",
-    "name": { "str": "5.56 NATO M855A1" },
+    "name": { "str_sp": "5.56 NATO M855A1" },
     "description": "An updated loading of M855 5.56x45mm ammunition, featuring a 62 grain projectile containing an exposed steel penetrator and copper slug.  Designed as a mostly lead-free projectile, the opportunity was further taken to improve upon M855's penetration and lethality characteristics through penetrator design and increased pressure.  Its improved accuracy, penetration and lethality over M855 are appreciated by users of shorter-barreled AR variants.",
     "price": 290,
     "price_postapoc": 900,
@@ -39,7 +39,7 @@
     "id": "556_incendiary",
     "copy-from": "556",
     "type": "AMMO",
-    "name": { "str": "5.56 NATO M856 tracer" },
+    "name": { "str_sp": "5.56 NATO M856 tracer" },
     "description": "An M856 tracer round.  Traditional practice is to load one tracer per every four normal rounds to help keep the weapon they are fired from on target.  They have the potential to ignite flammable surfaces at their point of impact.",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
@@ -47,8 +47,8 @@
     "id": "bp_223",
     "copy-from": "223",
     "type": "AMMO",
-    "name": { "str": ".223 Remington, black powder" },
-    "description": ".223 Remington ammunition with a 55gr bullet, patterned after the M193 loading.  The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "name": { "str_sp": ".223 Remington, black powder" },
+    "description": ".223 Remington ammunition with a 55gr bullet, patterned after the M193 loading.  The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
@@ -62,8 +62,8 @@
     "id": "bp_556",
     "copy-from": "556",
     "type": "AMMO",
-    "name": { "str": "5.56 NATO M855A1, black powder" },
-    "description": "5.56x45mm ammunition with a 62gr FMJ bullet.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "name": { "str_sp": "5.56 NATO M855A1, black powder" },
+    "description": "5.56x45mm ammunition with a 62gr FMJ bullet.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
@@ -77,8 +77,8 @@
     "id": "bp_556_incendiary",
     "copy-from": "556_incendiary",
     "type": "AMMO",
-    "name": { "str": "5.56 NATO M856 tracer, black powder" },
-    "description": "An M856 tracer round.  Traditional practice is to load one tracer per every four normal rounds to help keep the weapon they are fired from on target.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "name": { "str_sp": "5.56 NATO M856 tracer, black powder" },
+    "description": "An M856 tracer round.  Traditional practice is to load one tracer per every four normal rounds to help keep the weapon they are fired from on target.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
@@ -92,7 +92,7 @@
     "id": "reloaded_223",
     "copy-from": "223",
     "type": "AMMO",
-    "name": { "str": ".223 Remington, reloaded" },
+    "name": { "str_sp": ".223 Remington, reloaded" },
     "description": ".223 Remington ammunition with a 55gr bullet, patterned after the M193 loading.  The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -102,7 +102,7 @@
     "id": "reloaded_556",
     "copy-from": "556",
     "type": "AMMO",
-    "name": { "str": "5.56 NATO M855A1, reloaded" },
+    "name": { "str_sp": "5.56 NATO M855A1, reloaded" },
     "description": "5.56x45mm ammunition with a 62gr FMJ bullet.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -112,7 +112,7 @@
     "id": "reloaded_556_incendiary",
     "copy-from": "556_incendiary",
     "type": "AMMO",
-    "name": { "str": "5.56 NATO M856 tracer, reloaded" },
+    "name": { "str_sp": "5.56 NATO M856 tracer, reloaded" },
     "description": "An M856 tracer round.  Traditional practice is to load one tracer per every four normal rounds to help keep the weapon they are fired from on target.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
diff --git a/json/items/ammo/270win.json b/json/items/ammo/270win.json
index 53f434d..34245e2 100644
--- a/json/items/ammo/270win.json
+++ b/json/items/ammo/270win.json
@@ -2,10 +2,10 @@
   {
     "id": "270win_jsp",
     "type": "AMMO",
-    "name": { "str": ".270 Winchester JSP" },
-    "description": ".270 Winchester ammunition with 130gr soft point bullets.  The .270 round was not initially successful, but over a few decades it became one of the most popular rifle cartridges for hunting and silhouette shooting.  It is a powerful round capable of taking down large targets with ease.",
+    "name": { "str_sp": ".270 Winchester JSP" },
+    "description": ".270 Winchester ammunition with a 130gr soft point bullet.  The .270 round was not initially successful, but over a few decades it became one of the most popular rifle cartridges for hunting and silhouette shooting.  It is a powerful round capable of taking down large targets with ease.",
     "weight": "20 g",
-    "volume": "250 ml",
+    "volume": "189 ml",
     "price": 170,
     "price_postapoc": 600,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -27,7 +27,7 @@
     "copy-from": "270win_jsp",
     "type": "AMMO",
     "name": { "str_sp": ".270 Winchester JSP, black powder" },
-    "description": ".270 Winchester ammunition with a 130gr soft point bullet.  It is a powerful round capable of taking down large targets with ease, but someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "description": ".270 Winchester ammunition with a 130gr soft point bullet.  It is a powerful round capable of taking down large targets with ease, but someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.7, "armor_penetration": 0.5 },
diff --git a/json/items/ammo/300.json b/json/items/ammo/300.json
index 23e70c6..0c53f38 100644
--- a/json/items/ammo/300.json
+++ b/json/items/ammo/300.json
@@ -3,9 +3,9 @@
     "id": "300_winmag",
     "type": "AMMO",
     "name": { "str": ".300 Winchester Magnum" },
-    "description": ".300 Winchester Magnum ammunition with 220gr JHP bullets.  The 300WM round is an extremely powerful and accurate rifle round introduced in 1963.  It has proven popular with hunters and snipers, although it is not as common as .308 or .30-06.",
+    "description": ".300 Winchester Magnum ammunition with a 220gr JHP bullet.  The 300WM round is an extremely powerful and accurate rifle round introduced in 1963.  It has proven popular with hunters and snipers, although it is not as common as .308 or .30-06.",
     "weight": "28 g",
-    "volume": "250 ml",
+    "volume": "169 ml",
     "price": 220,
     "price_postapoc": 400,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -19,7 +19,7 @@
     "range": 65,
     "damage": { "damage_type": "bullet", "amount": 70, "armor_penetration": 8 },
     "dispersion": 15,
-    "recoil": 4000,
+    "recoil": 5300,
     "effects": [ "COOKOFF" ]
   },
   {
@@ -27,7 +27,7 @@
     "copy-from": "300_winmag",
     "type": "AMMO",
     "name": { "str_sp": ".300 Winchester Magnum, black powder" },
-    "description": ".300 Winchester Magnum ammunition with a 220gr JHP bullet.  The 300WM round is an extremely powerful and accurate rifle round, but someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "description": ".300 Winchester Magnum ammunition with a 220gr JHP bullet.  The 300WM round is an extremely powerful and accurate rifle round, but someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
diff --git a/json/items/ammo/3006.json b/json/items/ammo/3006.json
index 5488c40..a5e58c5 100644
--- a/json/items/ammo/3006.json
+++ b/json/items/ammo/3006.json
@@ -3,9 +3,9 @@
     "id": "3006",
     "type": "AMMO",
     "name": { "str_sp": ".30-06 Springfield" },
-    "description": ".30-06 Springfield rounds with 165gr soft point bullets.  The .30-06 cartridge has excellent accuracy, range, and stopping power making it popular with hunters and snipers for well over a century.",
+    "description": ".30-06 Springfield ammunition with a 165gr soft point bullet.  The .30-06 cartridge has excellent accuracy, range, and stopping power making it popular with hunters and snipers for well over a century.",
     "weight": "20 g",
-    "volume": "250 ml",
+    "volume": "192 ml",
     "price": 160,
     "price_postapoc": 800,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -35,7 +35,7 @@
     "copy-from": "3006",
     "type": "AMMO",
     "name": { "str_sp": ".30-06 M2 AP" },
-    "description": "Armor piercing .30-06 M2 ammunition with 168gr FMJ bullets.  It is an extremely powerful and accurate cartridge but pays for its armor penetration abilities with lowered damage.",
+    "description": "Armor piercing .30-06 M2 ammunition with a 168gr FMJ bullet.  It is an extremely powerful and accurate cartridge, but pays for its armor penetration abilities with lowered damage.",
     "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } }
   },
   {
@@ -43,7 +43,7 @@
     "copy-from": "3006",
     "type": "AMMO",
     "name": { "str_sp": ".30-06 Springfield, black powder" },
-    "description": ".30-06 Springfield ammunition with a 165gr soft point bullet.  The .30-06 cartridge has excellent accuracy, range, and stopping power making it popular with hunters and snipers for well over a century.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "description": ".30-06 Springfield ammunition with a 165gr soft point bullet.  The .30-06 cartridge has excellent accuracy, range, and stopping power making it popular with hunters and snipers for well over a century.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -58,7 +58,7 @@
     "copy-from": "3006_incendiary",
     "type": "AMMO",
     "name": { "str_sp": ".30-06 M14A1 tracer, black powder" },
-    "description": ".30-06 M14A1 tracer ammunition to help keep the weapon it is fired from on target.  Someone was down on their luck when they hand-reloaded this - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "description": ".30-06 M14A1 tracer ammunition to help keep the weapon it is fired from on target.  Someone was down on their luck when they hand-reloaded this - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -73,7 +73,7 @@
     "copy-from": "3006fmj",
     "type": "AMMO",
     "name": { "str_sp": ".30-06 M2 AP, black powder" },
-    "description": "Armor piercing .30-06 M2 ammunition with a 168gr FMJ bullet.  It is an extremely powerful and accurate cartridge, but pays for its armor penetration abilities with lowered damage.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "description": "Armor piercing .30-06 M2 ammunition with a 168gr FMJ bullet.  It is an extremely powerful and accurate cartridge, but pays for its armor penetration abilities with lowered damage.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
diff --git a/json/items/ammo/300blk.json b/json/items/ammo/300blk.json
index 6d774f3..812ba3f 100644
--- a/json/items/ammo/300blk.json
+++ b/json/items/ammo/300blk.json
@@ -38,7 +38,7 @@
     "copy-from": "300blk",
     "type": "AMMO",
     "name": { "str": ".300 AAC Blackout, black powder", "str_pl": ".300 AAC Blackouts, black powder" },
-    "description": "A .300 AAC Blackout round with a 125gr bullet.  300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "description": "A .300 AAC Blackout round with a 125gr bullet.  300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
diff --git a/json/items/ammo/308.json b/json/items/ammo/308.json
index 5215892..96f7e44 100644
--- a/json/items/ammo/308.json
+++ b/json/items/ammo/308.json
@@ -2,10 +2,10 @@
   {
     "id": "308",
     "type": "AMMO",
-    "name": { "str": ".308 Winchester" },
+    "name": { "str_sp": ".308 Winchester" },
     "description": ".308 Winchester ammunition with a 168gr hollow point bullet.  The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.",
     "weight": "18 g",
-    "volume": "250 ml",
+    "volume": "158 ml",
     "price": 180,
     "price_postapoc": 800,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -26,7 +26,7 @@
     "id": "762_51",
     "copy-from": "308",
     "type": "AMMO",
-    "name": { "str": "7.62x51mm NATO M80" },
+    "name": { "str_sp": "7.62x51mm NATO M80" },
     "casing": "762_51_casing",
     "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.",
     "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
@@ -37,7 +37,7 @@
     "id": "762_51_incendiary",
     "copy-from": "762_51",
     "type": "AMMO",
-    "name": { "str": "7.62x51mm NATO M62 tracer" },
+    "name": { "str_sp": "7.62x51mm NATO M62 tracer" },
     "description": "A 7.62x51mm NATO tracer round.  Traditional practice is to load one of these for every four normal rounds to help keep the weapon they are fired from on target.  They have the potential to ignite flammable surfaces on impact.",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
@@ -45,8 +45,8 @@
     "id": "bp_308",
     "copy-from": "308",
     "type": "AMMO",
-    "name": { "str": ".308 Winchester, black powder" },
-    "description": ".308 Winchester ammunition with a 168gr hollow point bullet.  The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "name": { "str_sp": ".308 Winchester, black powder" },
+    "description": ".308 Winchester ammunition with a 168gr hollow point bullet.  The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -60,8 +60,8 @@
     "id": "bp_762_51",
     "copy-from": "762_51",
     "type": "AMMO",
-    "name": { "str": "7.62x51mm NATO M80, black powder" },
-    "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "name": { "str_sp": "7.62x51mm NATO M80, black powder" },
+    "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -75,8 +75,8 @@
     "id": "bp_762_51_incendiary",
     "copy-from": "762_51_incendiary",
     "type": "AMMO",
-    "name": { "str": "7.62x51mm NATO M62 tracer, black powder" },
-    "description": "A 7.62x51mm NATO tracer round.  Traditional practice is to load one of these for every four normal rounds to help keep the weapon they are fired from on target.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "name": { "str_sp": "7.62x51mm NATO M62 tracer, black powder" },
+    "description": "A 7.62x51mm NATO tracer round.  Traditional practice is to load one of these for every four normal rounds to help keep the weapon they are fired from on target.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
@@ -90,7 +90,7 @@
     "id": "reloaded_308",
     "copy-from": "308",
     "type": "AMMO",
-    "name": { "str": ".308 Winchester, reloaded" },
+    "name": { "str_sp": ".308 Winchester, reloaded" },
     "description": ".308 Winchester ammunition with a 168gr hollow point bullet.  The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -100,7 +100,7 @@
     "id": "reloaded_762_51",
     "copy-from": "762_51",
     "type": "AMMO",
-    "name": { "str": "7.62x51mm NATO M80, reloaded" },
+    "name": { "str_sp": "7.62x51mm NATO M80, reloaded" },
     "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -110,7 +110,7 @@
     "id": "reloaded_762_51_incendiary",
     "copy-from": "762_51_incendiary",
     "type": "AMMO",
-    "name": { "str": "7.62x51mm NATO M62 tracer, reloaded" },
+    "name": { "str_sp": "7.62x51mm NATO M62 tracer, reloaded" },
     "description": "A 7.62x51mm NATO tracer round.  Traditional practice is to load one of these for every four normal rounds to help keep the weapon they are fired from on target.  It's been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
diff --git a/json/items/ammo/32.json b/json/items/ammo/32.json
index c8b1f5d..6599d30 100644
--- a/json/items/ammo/32.json
+++ b/json/items/ammo/32.json
@@ -23,16 +23,6 @@
     "effects": [ "COOKOFF" ]
   },
   {
-    "id": "reloaded_32_acp",
-    "copy-from": "32_acp",
-    "type": "AMMO",
-    "name": { "str_sp": ".32 ACP, reloaded" },
-    "description": "A .32 ACP round, once a popular handgun cartridge in the 20th century.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "bp_32_acp",
     "copy-from": "32_acp",
     "type": "AMMO",
@@ -46,5 +36,15 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_32_acp",
+    "copy-from": "32_acp",
+    "type": "AMMO",
+    "name": { "str_sp": ".32 ACP, reloaded" },
+    "description": "A .32 ACP round, once a popular handgun cartridge in the 20th century.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/357mag.json b/json/items/ammo/357mag.json
index a06ca7e..65e57c1 100644
--- a/json/items/ammo/357mag.json
+++ b/json/items/ammo/357mag.json
@@ -31,22 +31,6 @@
     "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": -2 } }
   },
   {
-    "id": "reloaded_357mag_fmj",
-    "copy-from": "357mag_fmj",
-    "type": "AMMO",
-    "name": { "str_sp": ".357 Magnum FMJ, reloaded" },
-    "description": "Jacketed .357 Magnum ammunition.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
-  },
-  {
-    "id": "reloaded_357mag_jhp",
-    "copy-from": "357mag_jhp",
-    "type": "AMMO",
-    "name": { "str_sp": ".357 Magnum JHP, reloaded" },
-    "description": "Jacketed hollow point .357 Magnum ammunition.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
-  },
-  {
     "id": "bp_357mag_fmj",
     "copy-from": "357mag_fmj",
     "type": "AMMO",
@@ -75,5 +59,21 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_357mag_fmj",
+    "copy-from": "357mag_fmj",
+    "type": "AMMO",
+    "name": { "str_sp": ".357 Magnum FMJ, reloaded" },
+    "description": "Jacketed .357 Magnum ammunition.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
+  },
+  {
+    "id": "reloaded_357mag_jhp",
+    "copy-from": "357mag_jhp",
+    "type": "AMMO",
+    "name": { "str_sp": ".357 Magnum JHP, reloaded" },
+    "description": "Jacketed hollow point .357 Magnum ammunition.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
   }
 ]
diff --git a/json/items/ammo/357sig.json b/json/items/ammo/357sig.json
index 21c4150..a5edbce 100644
--- a/json/items/ammo/357sig.json
+++ b/json/items/ammo/357sig.json
@@ -17,7 +17,7 @@
     "ammo_type": "357sig",
     "casing": "357sig_casing",
     "range": 16,
-    "damage": { "damage_type": "bullet", "amount": 29, "armor_penetration": 4 },
+    "damage": { "damage_type": "bullet", "amount": 29, "armor_penetration": 8 },
     "dispersion": 30,
     "recoil": 600,
     "effects": [ "COOKOFF" ]
@@ -28,7 +28,7 @@
     "type": "AMMO",
     "name": { "str_sp": ".357 SIG JHP" },
     "description": "Jacketed hollow point .357 SIG ammunition.  The .357 SIG round is a high velocity pistol cartridge, giving it a flatter trajectory than many handgun rounds.",
-    "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": -2 } }
+    "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": -4 } }
   },
   {
     "id": "reloaded_357sig_fmj",
diff --git a/json/items/ammo/380.json b/json/items/ammo/380.json
index d982199..7646b63 100644
--- a/json/items/ammo/380.json
+++ b/json/items/ammo/380.json
@@ -44,36 +44,6 @@
     "proportional": { "recoil": 1.1 }
   },
   {
-    "id": "reloaded_380_FMJ",
-    "copy-from": "380_FMJ",
-    "type": "AMMO",
-    "name": { "str_sp": ".380 ACP FMJ, reloaded" },
-    "description": ".380 ACP ammunition with a brass jacketed 95gr bullet.  Popular in pocket pistols for over a century, it is often considered the weakest caliber to consider for self-defense.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_380_JHP",
-    "copy-from": "380_JHP",
-    "type": "AMMO",
-    "name": { "str_sp": ".380 ACP JHP, reloaded" },
-    "description": ".380 ACP ammunition with a 95gr jacketed hollow point bullet.  It is a popular round for small concealable backup pistols, and often the weakest recommended defensive caliber.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_380_p",
-    "copy-from": "380_p",
-    "type": "AMMO",
-    "name": { "str_sp": ".380 ACP +P, reloaded" },
-    "description": "Overpressure .380 ACP ammunition with a 90gr jacketed hollow point bullet.  This defensive loading is designed to maximize performance, and tends to be more accurate than practice ammo.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "bp_380_FMJ",
     "copy-from": "380_FMJ",
     "type": "AMMO",
@@ -102,5 +72,35 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_380_FMJ",
+    "copy-from": "380_FMJ",
+    "type": "AMMO",
+    "name": { "str_sp": ".380 ACP FMJ, reloaded" },
+    "description": ".380 ACP ammunition with a brass jacketed 95gr bullet.  Popular in pocket pistols for over a century, it is often considered the weakest caliber to consider for self-defense.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_380_JHP",
+    "copy-from": "380_JHP",
+    "type": "AMMO",
+    "name": { "str_sp": ".380 ACP JHP, reloaded" },
+    "description": ".380 ACP ammunition with a 95gr jacketed hollow point bullet.  It is a popular round for small concealable backup pistols, and often the weakest recommended defensive caliber.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_380_p",
+    "copy-from": "380_p",
+    "type": "AMMO",
+    "name": { "str_sp": ".380 ACP +P, reloaded" },
+    "description": "Overpressure .380 ACP ammunition with a 90gr jacketed hollow point bullet.  This defensive loading is designed to maximize performance, and tends to be more accurate than practice ammo.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/40.json b/json/items/ammo/40.json
index 0018673..109bec5 100644
--- a/json/items/ammo/40.json
+++ b/json/items/ammo/40.json
@@ -31,26 +31,6 @@
     "relative": { "damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 6 } }
   },
   {
-    "id": "reloaded_40fmj",
-    "copy-from": "40fmj",
-    "type": "AMMO",
-    "name": { "str_sp": ".40 S&W FMJ, reloaded" },
-    "description": ".40 S&W ammunition with a 180gr FMJ bullet.  Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_40sw",
-    "copy-from": "40sw",
-    "type": "AMMO",
-    "name": { "str_sp": ".40 S&W JHP, reloaded" },
-    "description": ".40 S&W ammunition with a 135gr JHP bullet.  The .40 S&W round is descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "bp_40fmj",
     "copy-from": "40fmj",
     "type": "AMMO",
@@ -79,5 +59,25 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_40fmj",
+    "copy-from": "40fmj",
+    "type": "AMMO",
+    "name": { "str_sp": ".40 S&W FMJ, reloaded" },
+    "description": ".40 S&W ammunition with a 180gr FMJ bullet.  Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_40sw",
+    "copy-from": "40sw",
+    "type": "AMMO",
+    "name": { "str_sp": ".40 S&W JHP, reloaded" },
+    "description": ".40 S&W ammunition with a 135gr JHP bullet.  The .40 S&W round is descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/44.json b/json/items/ammo/44.json
index 93a0d16..4c85eec 100644
--- a/json/items/ammo/44.json
+++ b/json/items/ammo/44.json
@@ -31,21 +31,21 @@
     "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } }
   },
   {
-    "id": "reloaded_44magnum",
-    "copy-from": "44magnum",
+    "id": "reloaded_44fmj",
+    "copy-from": "44fmj",
     "type": "AMMO",
-    "name": { "str_sp": ".44 Magnum, reloaded" },
-    "description": ".44 Magnum ammunition with a 240gr JHP bullet.  The .44 Magnum round is one of the most powerful handgun cartridges available.  It has excellent stopping power but suffers from extremely high recoil for a handgun round.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "name": { "str_sp": ".44 Magnum FMJ, reloaded" },
+    "description": "A brass-jacketed variant of the .44 Magnum round.  This increases penetration slightly at the cost of reduced damage from expansion.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
-    "id": "reloaded_44fmj",
-    "copy-from": "44fmj",
+    "id": "reloaded_44magnum",
+    "copy-from": "44magnum",
     "type": "AMMO",
-    "name": { "str_sp": ".44 Magnum FMJ, reloaded" },
-    "description": "A brass-jacketed variant of the .44 Magnum round.  This increases penetration slightly at the cost of reduced damage from expansion.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "name": { "str_sp": ".44 Magnum, reloaded" },
+    "description": ".44 Magnum ammunition with a 240gr JHP bullet.  The .44 Magnum round is one of the most powerful handgun cartridges available.  It has excellent stopping power but suffers from extremely high recoil for a handgun round.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
diff --git a/json/items/ammo/44paper.json b/json/items/ammo/44paper.json
new file mode 100644
index 0000000..cf1f4e5
--- /dev/null
+++ b/json/items/ammo/44paper.json
@@ -0,0 +1,22 @@
+[
+  {
+    "id": "44army",
+    "type": "AMMO",
+    "name": { "str": ".44 paper cartridge" },
+    "description": "A paper cartridge containing a premeasured amount of black powder and a .44 projectile.  Used by the Colt M1860 Army.",
+    "weight": "7 g",
+    "volume": "20 ml",
+    "price": 350,
+    "price_postapoc": 1000,
+    "material": [ "paper", "powder", "lead" ],
+    "symbol": "=",
+    "color": "white",
+    "count": 25,
+    "ammo_type": "44paper",
+    "range": 18,
+    "damage": { "damage_type": "bullet", "amount": 27 },
+    "dispersion": 70,
+    "recoil": 580,
+    "effects": [ "COOKOFF", "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ]
+  }
+]
diff --git a/json/items/ammo/45.json b/json/items/ammo/45.json
index 0886ae2..11896ef 100644
--- a/json/items/ammo/45.json
+++ b/json/items/ammo/45.json
@@ -43,36 +43,6 @@
     "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 4 }, "dispersion": -10, "recoil": 60 }
   },
   {
-    "id": "reloaded_45_acp",
-    "copy-from": "45_acp",
-    "type": "AMMO",
-    "name": { "str_sp": ".45 ACP FMJ, reloaded" },
-    "description": ".45 ACP ammunition with a 230gr FMJ bullet.  Due to a reputation for effectiveness, the .45 ACP round has been common for over a century.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_45_jhp",
-    "copy-from": "45_jhp",
-    "type": "AMMO",
-    "name": { "str_sp": ".45 ACP JHP, reloaded" },
-    "description": ".45 ACP ammunition with a 185gr JHP bullet.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_45_super",
-    "copy-from": "45_super",
-    "type": "AMMO",
-    "name": { "str_sp": ".45 ACP +P, reloaded" },
-    "description": "Overpressure .45 ACP ammunition with a 185gr JHP bullet.  This +P ammunition has higher muzzle energy than typical loads, leading to greater damage, accuracy and recoil.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "bp_45_acp",
     "copy-from": "45_acp",
     "type": "AMMO",
@@ -101,5 +71,35 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_45_acp",
+    "copy-from": "45_acp",
+    "type": "AMMO",
+    "name": { "str_sp": ".45 ACP FMJ, reloaded" },
+    "description": ".45 ACP ammunition with a 230gr FMJ bullet.  Due to a reputation for effectiveness, the .45 ACP round has been common for over a century.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_45_jhp",
+    "copy-from": "45_jhp",
+    "type": "AMMO",
+    "name": { "str_sp": ".45 ACP JHP, reloaded" },
+    "description": ".45 ACP ammunition with a 185gr JHP bullet.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_45_super",
+    "copy-from": "45_super",
+    "type": "AMMO",
+    "name": { "str_sp": ".45 ACP +P, reloaded" },
+    "description": "Overpressure .45 ACP ammunition with a 185gr JHP bullet.  This +P ammunition has higher muzzle energy than typical loads, leading to greater damage, accuracy and recoil.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/4570.json b/json/items/ammo/4570.json
index 7811867..e437c91 100644
--- a/json/items/ammo/4570.json
+++ b/json/items/ammo/4570.json
@@ -2,10 +2,10 @@
   {
     "id": "4570_sp",
     "type": "AMMO",
-    "name": { "str": ".45-70 SP" },
-    "description": ".45-70 Government ammunition loaded with a 305 grain soft point round.  One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.",
+    "name": { "str_sp": ".45-70 SP" },
+    "description": ".45-70 Government ammunition loaded with a 305 grain soft point bullet.  One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.",
     "weight": "35 g",
-    "volume": "250 ml",
+    "volume": "167 ml",
     "price": 125,
     "price_postapoc": 800,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -27,7 +27,7 @@
     "copy-from": "4570_sp",
     "type": "AMMO",
     "name": { "str": ".45-70 +P penetrator" },
-    "description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile.  Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.",
+    "description": ".45-70 Government overpressure ammunition loaded with a 305 grain solid copper penetrator projectile.  Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.",
     "price": 175,
     "price_postapoc": 600,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -38,7 +38,7 @@
     "id": "4570_low",
     "copy-from": "4570_sp",
     "type": "AMMO",
-    "name": { "str": ".45-70 LFN cowboy" },
+    "name": { "str_sp": ".45-70 LFN cowboy" },
     "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms.  Quite a bit less powerful than modern ammo, but still packs a punch.",
     "price": 250,
     "price_postapoc": 400,
@@ -46,21 +46,11 @@
     "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -2 }, "recoil": -900 }
   },
   {
-    "id": "reloaded_4570_bp",
-    "copy-from": "4570_low",
-    "type": "AMMO",
-    "name": { "str": ".45-70, black powder" },
-    "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet using black powder to original specifications.  Quite a bit less powerful and a lot dirtier than modern ammo, but still packs a punch.  This one has been hand-loaded.",
-    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
-    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "reloaded_4570_sp",
     "copy-from": "4570_sp",
     "type": "AMMO",
-    "name": { "str": ".45-70 SP, reloaded" },
-    "description": ".45-70 Government ammunition loaded with a 305 grain soft point round.  One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.",
+    "name": { "str_sp": ".45-70 SP, reloaded" },
+    "description": ".45-70 Government ammunition loaded with a 305 grain soft point bullet.  One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -69,8 +59,8 @@
     "id": "reloaded_4570_pen",
     "copy-from": "4570_pen",
     "type": "AMMO",
-    "name": { "str": ".45-70 +P penetrator, reloaded" },
-    "description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile.  Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.",
+    "name": { "str": ".45-70 +P penetrator, reloaded", "str_pl": ".45-70 +P penetrators, reloaded" },
+    "description": ".45-70 Government overpressure ammunition loaded with a 305 grain solid copper penetrator projectile.  Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -79,10 +69,20 @@
     "id": "reloaded_4570_low",
     "copy-from": "4570_low",
     "type": "AMMO",
-    "name": { "str": ".45-70 LFN cowboy, reloaded" },
-    "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms.  Quite a bit less powerful than modern ammo, but still packs a punch.",
+    "name": { "str_sp": ".45-70 LFN cowboy, reloaded" },
+    "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms.  Quite a bit less powerful than modern ammo, but still packs a punch.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_4570_bp",
+    "copy-from": "4570_low",
+    "type": "AMMO",
+    "name": { "str_sp": ".45-70, black powder" },
+    "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet using black powder to original specifications.  Quite a bit less powerful and a lot dirtier than modern ammo, but still packs a punch.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.3 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/50.json b/json/items/ammo/50.json
index af9cefa..2234712 100644
--- a/json/items/ammo/50.json
+++ b/json/items/ammo/50.json
@@ -3,9 +3,9 @@
     "id": "50bmg",
     "type": "AMMO",
     "name": { "str_sp": ".50 BMG M33 Ball" },
-    "description": ".50 BMG ammunition with mild steel cored 661gr FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
+    "description": ".50 BMG ammunition with a mild steel cored 661gr FMJ bullet.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
     "weight": "114 g",
-    "volume": "250 ml",
+    "volume": "451 ml",
     "price": 2200,
     "price_postapoc": 2500,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -19,7 +19,7 @@
     "range": 110,
     "damage": { "damage_type": "bullet", "amount": 131, "armor_penetration": 28 },
     "dispersion": 150,
-    "recoil": 5000,
+    "recoil": 26250,
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
   },
   {
@@ -60,7 +60,7 @@
     "price": 60000,
     "price_postapoc": 7500,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
-    "description": "This variant of the .50 BMG round makes the most of the caliber's potential payload delivery: the tip is loaded with an incendiary mix, which ignites on impact, detonating the RDX or PETN charge.  This also ignites a secondary zirconium powder incendiary charge that surrounds a tungsten carbide penetrator, both encased by a mild steel cup.  Fragments from the cup and burning metallic powder follow the penetrator through armored targets, increasing lethality.  These rare, complicated, and expensive rounds are not likely to be manufactured again; use them wisely.",
+    "description": "This variant of the .50 BMG round makes the most of the caliber's potential payload delivery: the tip is loaded with an incendiary mix, which ignites on impact, detonating the RDX or PETN charge.  This also ignites a secondary zirconium powder incendiary charge that surrounds a tungsten carbide penetrator, both encased by a mild steel cup.  Fragments from the cup and burning metallic powder follow the penetrator through armored targets, increasing lethality.  This rare, complicated, and expensive round is not likely to be manufactured again; use it wisely.",
     "effects": [ "INCENDIARY", "EXPLOSIVE_BIG" ],
     "//": "mk 211 is estimated to be as effective as 20mm, which would have 65kJ energy, or 255 damage. ~181 damage is fair.",
     "relative": { "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 20 } },
@@ -71,7 +71,7 @@
     "copy-from": "50_incendiary",
     "type": "AMMO",
     "name": { "str_sp": ".50 BMG M17 tracer, reloaded" },
-    "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo..",
+    "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.  This one has been hand-reloaded  by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -91,7 +91,7 @@
     "copy-from": "50ss",
     "type": "AMMO",
     "name": { "str_sp": ".50 BMG M2 AP, reloaded" },
-    "description": "A variant of the .50 BMG round that uses a core of hardened steel.  Penetration is increased, but damage is reduced.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "description": "A variant of the .50 BMG round that uses a core of hardened steel.  Penetration is increased, but damage is reduced.  This one has been hand-reloaded.  by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
diff --git a/json/items/ammo/57.json b/json/items/ammo/57.json
index 719e3ec..483e5ea 100644
--- a/json/items/ammo/57.json
+++ b/json/items/ammo/57.json
@@ -2,10 +2,10 @@
   {
     "id": "57mm",
     "type": "AMMO",
-    "name": { "str": "5.7x28mm SS190" },
-    "description": "5.7x28mm ammunition with 31gr AP FMJ bullets.  The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use.  Although the project to replace 9x19mm Parabellum was effectively canceled the 5.7x28mm round has seen action in many conflicts and has proven to be reliable.  It has very low recoil and its armor penetration is a defining feature.",
+    "name": { "str_sp": "5.7x28mm SS190" },
+    "description": "5.7x28mm ammunition with a 31gr AP FMJ bullet.  The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use.  Although the project to replace 9x19mm Parabellum was effectively canceled, the 5.7x28mm round has seen action in many conflicts and has proven to be reliable.  It has very low recoil and its armor penetration is a defining feature.",
     "weight": "6 g",
-    "volume": "250 ml",
+    "volume": "121 ml",
     "price": 350,
     "price_postapoc": 1600,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -24,21 +24,11 @@
     "effects": [ "COOKOFF" ]
   },
   {
-    "id": "reloaded_57mm",
-    "copy-from": "57mm",
-    "type": "AMMO",
-    "name": { "str": "5.7x28mm SS190, reloaded" },
-    "description": "5.7x28mm ammunition with 31gr AP FMJ bullets.  The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use.  Although the project to replace 9x19mm Parabellum was effectively canceled the 5.7x28mm round has seen action in many conflicts and has proven to be reliable.  It has very low recoil but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.2 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "bp_57mm",
     "copy-from": "57mm",
     "type": "AMMO",
-    "name": { "str": "5.7x28mm SS190, black powder" },
-    "description": "5.7x28mm ammunition with 31gr AP FMJ bullets.  The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use.  Although the project to replace 9x19mm Parabellum was effectively canceled the 5.7x28mm round has seen action in many conflicts and has proven to be reliable.  It has very low recoil but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
+    "name": { "str_sp": "5.7x28mm SS190, black powder" },
+    "description": "5.7x28mm ammunition with a 31gr AP FMJ bullet.  The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use.  Although the project to replace 9x19mm Parabellum was effectively canceled, the 5.7x28mm round has seen action in many conflicts and has proven to be reliable.  It has very low recoil but lacks its usual armor penetration due to using a simple lead bullet rather than a proper factory-made penetrator projectile.",
     "proportional": {
       "price": 0.3,
       "damage": { "damage_type": "bullet", "amount": 0.56, "armor_penetration": 0.1 },
@@ -47,5 +37,15 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_57mm",
+    "copy-from": "57mm",
+    "type": "AMMO",
+    "name": { "str_sp": "5.7x28mm SS190, reloaded" },
+    "description": "5.7x28mm ammunition with a 31gr AP FMJ bullet.  The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use.  Although the project to replace 9x19mm Parabellum was effectively canceled, the 5.7x28mm round has seen action in many conflicts and has proven to be reliable.  It has very low recoil but lacks its usual armor penetration due to using a simple lead bullet rather than a proper factory-made penetrator projectile.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.2 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/5x50.json b/json/items/ammo/5x50.json
index abd01ff..bbb3b55 100644
--- a/json/items/ammo/5x50.json
+++ b/json/items/ammo/5x50.json
@@ -5,7 +5,7 @@
     "name": { "str": "RA110 5x50mm flechette" },
     "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.",
     "weight": "8 g",
-    "volume": "250 ml",
+    "volume": "144 ml",
     "price": 1125,
     "material": [ "plastic", "powder", "steel" ],
     "symbol": "=",
@@ -38,7 +38,7 @@
     "id": "reloaded_5x50dart",
     "copy-from": "5x50dart",
     "type": "AMMO",
-    "name": { "str": "RA110 5x50mm flechette, reloaded" },
+    "name": { "str": "RA110 5x50mm flechette, reloaded", "str_pl": "RA110 5x50mm flechettes, reloaded" },
     "price_postapoc": 1200,
     "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.  This one has been hand-reloaded by a lucky survivor or perhaps a pre-Cataclysm corporate spy, leading to slightly inferior performance compared to factory-produced ammo.",
     "effects": [ "COOKOFF", "RECYCLED" ],
diff --git a/json/items/ammo/762x25.json b/json/items/ammo/762x25.json
index 6a5f2f9..b1dec30 100644
--- a/json/items/ammo/762x25.json
+++ b/json/items/ammo/762x25.json
@@ -48,14 +48,6 @@
     }
   },
   {
-    "id": "reloaded_762_25",
-    "copy-from": "762_25hot",
-    "type": "AMMO",
-    "name": { "str_sp": "7.62x25mm FMJ, reloaded" },
-    "description": "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with an 85 gr. FMJ bullet.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 }
-  },
-  {
     "id": "bp_762_25",
     "//": "Should this be copied from 762_25hot, or 762_25?",
     "copy-from": "762_25hot",
@@ -70,5 +62,13 @@
     },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_762_25",
+    "copy-from": "762_25hot",
+    "type": "AMMO",
+    "name": { "str_sp": "7.62x25mm FMJ, reloaded" },
+    "description": "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with an 85 gr. FMJ bullet.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 }
   }
 ]
diff --git a/json/items/ammo/8x40mm.json b/json/items/ammo/8x40mm.json
index 0247939..81cb047 100644
--- a/json/items/ammo/8x40mm.json
+++ b/json/items/ammo/8x40mm.json
@@ -4,9 +4,9 @@
     "type": "AMMO",
     "name": { "str_sp": "8x40mm caseless" },
     "//": "Cased ammo tends to be roughly $1/shot, more or less.  Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.",
-    "description": "8x40mm caseless rounds.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "description": "An 8x40mm caseless round.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "weight": "12 g",
-    "volume": "250 ml",
+    "volume": "230 ml",
     "price": 225,
     "price_postapoc": 8000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -23,39 +23,33 @@
     "effects": [ "NEVER_MISFIRES" ]
   },
   {
-    "id": "8mm_caseless_reloaded",
+    "id": "8mm_civilian",
     "copy-from": "8mm_caseless",
     "type": "AMMO",
-    "name": { "str": "8x40mm caseless, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm standard caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "name": { "str_sp": "8x40mm sporting" },
+    "description": "An 8x40mm caseless round, light sporting load sold for civilian use.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] },
+    "proportional": {
+      "price": 0.8,
+      "damage": { "damage_type": "bullet", "amount": 0.5, "armor_penetration": 0.5 },
+      "dispersion": 1.2,
+      "recoil": 0.5
+    }
   },
   {
-    "id": "8mm_jhp",
+    "id": "8mm_fmj",
     "copy-from": "8mm_caseless",
     "type": "AMMO",
-    "name": { "str": "8x40mm JHP" },
-    "description": "8x40mm caseless rounds, jacketed hollowpoint.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "relative": { "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": -10 } }
-  },
-  {
-    "id": "8mm_jhp_reloaded",
-    "copy-from": "8mm_jhp",
-    "type": "AMMO",
-    "name": { "str": "8x40mm JHP, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm JHP caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+    "name": { "str_sp": "8x40mm FMJ" },
+    "description": "An 8x40mm caseless round, full metal jacket.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 10 } }
   },
   {
     "id": "8mm_hvp",
     "copy-from": "8mm_caseless",
     "type": "AMMO",
-    "name": { "str": "8x40mm HVP" },
-    "description": "8x40mm caseless rounds, saboted high-velocity penetrator type.  Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "name": { "str_sp": "8x40mm HVP" },
+    "description": "An 8x40mm caseless round, saboted high-velocity penetrator type.  Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 2500,
     "price_postapoc": 50000,
     "count": 20,
@@ -63,62 +57,68 @@
     "proportional": { "dispersion": 1.5, "recoil": 1.5 }
   },
   {
-    "id": "8mm_hvp_reloaded",
-    "copy-from": "8mm_hvp",
-    "type": "AMMO",
-    "name": { "str": "8x40mm HVP, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm HVP caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "8mm_inc",
     "copy-from": "8mm_caseless",
     "type": "AMMO",
-    "name": { "str": "8x40mm tracer" },
-    "description": "8x40mm caseless rounds with tracers to help keep the weapon they are fired from on target at the risk of igniting flammable substances.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "name": { "str_sp": "8x40mm tracer" },
+    "description": "An 8x40mm caseless ammunition mixed with tracers to help keep the weapon they are fired from on target at the risk of igniting flammable substances.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "count": 20,
     "proportional": { "dispersion": 0.8 },
     "extend": { "effects": [ "INCENDIARY" ] }
   },
   {
-    "id": "8mm_inc_reloaded",
-    "copy-from": "8mm_inc",
+    "id": "8mm_jhp",
+    "copy-from": "8mm_caseless",
     "type": "AMMO",
-    "name": { "str": "8x40mm tracer, handmade" },
-    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm tracer caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "name": { "str_sp": "8x40mm JHP" },
+    "description": "An 8x40mm caseless round, jacketed hollowpoint.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "relative": { "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": -10 } }
+  },
+  {
+    "id": "8mm_caseless_reloaded",
+    "copy-from": "8mm_caseless",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm caseless, handmade" },
+    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm standard caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
-    "id": "8mm_civilian",
-    "copy-from": "8mm_caseless",
+    "id": "8mm_jhp_reloaded",
+    "copy-from": "8mm_jhp",
     "type": "AMMO",
-    "name": { "str": "8x40mm sporting" },
-    "description": "8x40mm caseless rounds, light sporting load sold for civilian use.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] },
-    "proportional": {
-      "price": 0.8,
-      "damage": { "damage_type": "bullet", "amount": 0.5, "armor_penetration": 0.5 },
-      "dispersion": 1.2,
-      "recoil": 0.5
-    }
+    "name": { "str_sp": "8x40mm JHP, handmade" },
+    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm JHP caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
-    "id": "8mm_fmj",
-    "copy-from": "8mm_caseless",
+    "id": "8mm_hvp_reloaded",
+    "copy-from": "8mm_hvp",
     "type": "AMMO",
-    "name": { "str": "8x40mm FMJ" },
-    "description": "8x40mm caseless rounds, full metal jacket.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
-    "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 10 } }
+    "name": { "str_sp": "8x40mm HVP, handmade" },
+    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm HVP caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "8mm_inc_reloaded",
+    "copy-from": "8mm_inc",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm tracer, handmade" },
+    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm tracer caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
   {
     "id": "8mm_fmj_reloaded",
     "copy-from": "8mm_fmj",
     "type": "AMMO",
-    "name": { "str": "8x40mm FMJ, handmade" },
+    "name": { "str_sp": "8x40mm FMJ, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm FMJ caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
diff --git a/json/items/ammo/9mm.json b/json/items/ammo/9mm.json
index 80c5a91..85cd7cf 100644
--- a/json/items/ammo/9mm.json
+++ b/json/items/ammo/9mm.json
@@ -57,6 +57,36 @@
     "proportional": { "recoil": 1.2 }
   },
   {
+    "id": "bp_9mm",
+    "copy-from": "9mm",
+    "type": "AMMO",
+    "name": { "str_sp": "9x19mm JHP, black powder" },
+    "description": "9x19mm ammunition with a 116gr jacketed hollow point bullet.  JHP rounds have inferior penetration to FMJ rounds, but their expansion slightly increases stopping power against unarmored targets and reduces overpenetration.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_9mmfmj",
+    "copy-from": "9mmfmj",
+    "type": "AMMO",
+    "name": { "str_sp": "9x19mm FMJ, black powder" },
+    "description": "9x19mm ammunition with a brass jacketed 115gr bullet.  It has been a popular round for military, law enforcement, and civilian use for over a century.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
     "id": "reloaded_9mm",
     "copy-from": "9mm",
     "type": "AMMO",
@@ -95,35 +125,5 @@
     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "bp_9mm",
-    "copy-from": "9mm",
-    "type": "AMMO",
-    "name": { "str_sp": "9x19mm JHP, black powder" },
-    "description": "9x19mm ammunition with a 116gr jacketed hollow point bullet.  JHP rounds have inferior penetration to FMJ rounds, but their expansion slightly increases stopping power against unarmored targets and reduces overpenetration.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
-    "proportional": {
-      "price": 0.3,
-      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
-      "recoil": 0.76,
-      "dispersion": 1.2
-    },
-    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "bp_9mmfmj",
-    "copy-from": "9mmfmj",
-    "type": "AMMO",
-    "name": { "str_sp": "9x19mm FMJ, black powder" },
-    "description": "9x19mm ammunition with a brass jacketed 115gr bullet.  It has been a popular round for military, law enforcement, and civilian use for over a century.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
-    "proportional": {
-      "price": 0.3,
-      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
-      "recoil": 0.76,
-      "dispersion": 1.2
-    },
-    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/9x18.json b/json/items/ammo/9x18.json
index bb28127..b36744a 100644
--- a/json/items/ammo/9x18.json
+++ b/json/items/ammo/9x18.json
@@ -46,37 +46,6 @@
     "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 8 } }
   },
   {
-    "id": "reloaded_9x18mm",
-    "copy-from": "9x18mm",
-    "type": "AMMO",
-    "name": { "str_sp": "9x18mm 57-N-181S, reloaded" },
-    "description": "9x18mm Makarov ammunition with a 93gr steel core FMJ bullet.  The 9x18mm round was very common in the Eastern Bloc during the 20th century, and remained in Russian military service into the 21st century.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_9x18mmP2",
-    "copy-from": "9x18mmP2",
-    "type": "AMMO",
-    "name": { "str_sp": "9x18mm SP-7, reloaded" },
-    "description": "9x18mm Makarov SP-7 ammunition.  The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st century.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_9x18mmfmj",
-    "copy-from": "9x18mmfmj",
-    "type": "AMMO",
-    "name": { "str_sp": "9x18mm RG028, reloaded" },
-    "description": "9x18mm Makarov RG028 ammunition.  The RG028 round uses a bullet with a hardened steel core to improve armor penetration.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "relative": { "damage": { "damage_type": "bullet", "amount": 0, "armor_penetration": -4 } },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
     "id": "bp_9x18mm",
     "copy-from": "9x18mm",
     "type": "AMMO",
@@ -103,8 +72,37 @@
       "recoil": 0.76,
       "dispersion": 1.2
     },
-    "relative": { "damage": { "damage_type": "bullet", "amount": 0, "armor_penetration": -4 } },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_9x18mm",
+    "copy-from": "9x18mm",
+    "type": "AMMO",
+    "name": { "str_sp": "9x18mm 57-N-181S, reloaded" },
+    "description": "9x18mm Makarov ammunition with a 93gr steel core FMJ bullet.  The 9x18mm round was very common in the Eastern Bloc during the 20th century, and remained in Russian military service into the 21st century.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_9x18mmP2",
+    "copy-from": "9x18mmP2",
+    "type": "AMMO",
+    "name": { "str_sp": "9x18mm SP-7, reloaded" },
+    "description": "9x18mm Makarov SP-7 ammunition.  The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st century.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_9x18mmfmj",
+    "copy-from": "9x18mmfmj",
+    "type": "AMMO",
+    "name": { "str_sp": "9x18mm RG028, reloaded" },
+    "description": "9x18mm Makarov RG028 ammunition.  The RG028 round uses a bullet with a hardened steel core to improve armor penetration.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
 ]
diff --git a/json/items/ammo/flintlock.json b/json/items/ammo/flintlock.json
index 25cf0f6..8429027 100644
--- a/json/items/ammo/flintlock.json
+++ b/json/items/ammo/flintlock.json
@@ -5,7 +5,7 @@
     "name": { "str": "paper cartridge" },
     "description": "A paper cartridge containing black powder and a metallic projectile.  Historically used to reload muzzleloaders in a more reasonable time.",
     "weight": "40 g",
-    "volume": "250 ml",
+    "volume": "10 ml",
     "price": 1100,
     "price_postapoc": 1200,
     "material": [ "lead", "powder" ],
@@ -14,12 +14,12 @@
     "count": 30,
     "stack_size": 10,
     "ammo_type": "flintlock",
-    "range": 12,
-    "damage": { "damage_type": "bullet", "amount": 50 },
+    "range": 6,
+    "damage": { "damage_type": "bullet", "amount": 30 },
     "dispersion": 90,
     "recoil": 1500,
     "loudness": 70,
-    "effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
+    "effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER", "RECYCLED" ]
   },
   {
     "id": "flintlock_shot",
@@ -27,7 +27,7 @@
     "name": { "str": "paper shot cartridge" },
     "description": "A paper cartridge containing black powder and metallic shot.  Historically used to reload muzzleloaders in a more reasonable time.",
     "weight": "40 g",
-    "volume": "250 ml",
+    "volume": "10 ml",
     "price": 1100,
     "price_postapoc": 1200,
     "material": [ "lead", "powder" ],
@@ -41,6 +41,6 @@
     "dispersion": 20,
     "recoil": 1500,
     "loudness": 90,
-    "effects": [ "COOKOFF", "MUZZLE_SMOKE", "SHOT", "BLACKPOWDER" ]
+    "effects": [ "COOKOFF", "MUZZLE_SMOKE", "SHOT", "BLACKPOWDER", "RECYCLED" ]
   }
 ]
diff --git a/json/items/ammo/shot.json b/json/items/ammo/shot.json
index f2f4224..a957143 100644
--- a/json/items/ammo/shot.json
+++ b/json/items/ammo/shot.json
@@ -5,7 +5,7 @@
     "name": { "str": "12ga 00 buckshot" },
     "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  Favored by SWAT forces.",
     "weight": "32 g",
-    "volume": "250 ml",
+    "volume": "439 ml",
     "price": 500,
     "price_postapoc": 800,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
@@ -140,7 +140,7 @@
     "copy-from": "shot_bird",
     "type": "AMMO",
     "name": { "str": "12ga birdshot, black powder" },
-    "description": "Weak shotgun ammunition.  Designed for hunting birds and other small game, its applications in combat are very limited.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "description": "Weak shotgun ammunition.  Designed for hunting birds and other small game, its applications in combat are very limited.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -160,7 +160,7 @@
     "copy-from": "shot_00",
     "type": "AMMO",
     "name": { "str": "12ga 00 buckshot, black powder" },
-    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  SWAT forces probably wouldn't use this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  SWAT forces probably wouldn't use this one - it's filled with black powder instead of smokeless powder.",
     "proportional": { "price": 0.6, "damage": { "damage_type": "heat", "amount": 0.8 }, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -170,7 +170,7 @@
     "copy-from": "shot_flechette",
     "type": "AMMO",
     "name": { "str": "12ga flechette, black powder" },
-    "description": "A shotgun shell filled with tiny steel darts.  Extremely damaging, plus the spread makes it very accurate at short range.  Slices through most forms of armor with ease.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "description": "A shotgun shell filled with tiny steel darts.  Extremely damaging, plus the spread makes it very accurate at short range.  Slices through most forms of armor with ease.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.8 }, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
@@ -180,7 +180,7 @@
     "copy-from": "shot_slug",
     "type": "AMMO",
     "name": { "str": "12ga slug, black powder" },
-    "description": "A heavy metal slug used to give a shotgun the range capabilities of a rifle.  Extremely damaging but rather inaccurate.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "description": "A heavy metal slug used to give a shotgun the range capabilities of a rifle.  Extremely damaging but rather inaccurate.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.",
     "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.8 }, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }