diff --git a/module/config/attributes.mjs b/module/config/attributes.mjs
index 1dc7ac34..b174ada1 100644
--- a/module/config/attributes.mjs
+++ b/module/config/attributes.mjs
@@ -172,7 +172,7 @@ export const RESOURCES = Object.freeze({
     id: "wounds",
     label: "RESOURCES.Wounds",
     type: "reserve",
-    tooltip: "Health × 2",
+    tooltip: "Health × 1.5",
     color: {
       high: Color.from(0xEE0000),
       low: Color.from(0xAA0000),
@@ -193,7 +193,7 @@ export const RESOURCES = Object.freeze({
   madness: {
     id: "madness",
     label: "RESOURCES.Madness",
-    tooltip: "Morale × 2",
+    tooltip: "Morale × 1.5",
     type: "reserve",
     color: {
       high: Color.from(0x9900CC),
diff --git a/module/data/hero.mjs b/module/data/hero.mjs
index 0c45b3d3..45fd4a01 100644
--- a/module/data/hero.mjs
+++ b/module/data/hero.mjs
@@ -271,7 +271,7 @@ export default class CrucibleHero extends foundry.abstract.TypeDataModel {
     r.health.value = Math.clamped(r.health.value, 0, r.health.max);
 
     // Wounds
-    r.wounds.max = 2 * r.health.max;
+    r.wounds.max = Math.ceil(1.5 * r.health.max);
     r.wounds.value = Math.clamped(r.wounds.value, 0, r.wounds.max);
 
     // Morale
@@ -279,7 +279,7 @@ export default class CrucibleHero extends foundry.abstract.TypeDataModel {
     r.morale.value = Math.clamped(r.morale.value, 0, r.morale.max);
 
     // Madness
-    r.madness.max = 2 * r.morale.max;
+    r.madness.max = Math.ceil(1.5 * r.morale.max);
     r.madness.value = Math.clamped(r.madness.value, 0, r.madness.max);
 
     // Action
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index 1e53473d..d5ab966a 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -835,8 +835,14 @@ export default class CrucibleActor extends Actor {
     if ( target.statuses.has("guarded") && isAttack ) banes.guarded = {label: "Guarded", number: 1};
 
     // Prone
+    if ( this.statuses.has("prone") && isAttack ) {
+      banes.prone = {label: "Prone", number: 1};
+    }
     if ( target.statuses.has("prone") && isAttack ) {
-      if ( ranged ) banes.prone = {label: "Prone", number: 1};
+      if ( ranged ) {
+        if ( "prone" in banes ) banes.prone.number += 1;
+        else banes.prone = {label: "Prone", number: 1};
+      }
       else boons.prone = {label: "Prone", number: 1};
     }
 
@@ -1431,9 +1437,8 @@ export default class CrucibleActor extends Actor {
     const {mainhand, offhand} = this.equipment.weapons;
 
     // Poisoner
-    if ( this.talentIds.has("poisoner00000000") && this.effects.get(SYSTEM.EFFECTS.getEffectId("poisonBlades")) ) {
-      outcome.effects.push(SYSTEM.EFFECTS.poisoned(this, outcome.target))
-    }
+    if ( this.talentIds.has("poisoner00000000") && this.effects.get(SYSTEM.EFFECTS.getEffectId("poisonBlades"))
+      && action.tags.has("melee") ) outcome.effects.push(SYSTEM.EFFECTS.poisoned(this, outcome.target));
 
     // Bloodletter
     if ( this.talentIds.has("bloodletter00000") ) {
@@ -2033,13 +2038,22 @@ export default class CrucibleActor extends Actor {
    * @return {Promise}            A Promise which resolves once the weapon has been equipped or un-equipped
    */
   async equipWeapon(itemId, {slot, equipped=true}={}) {
+
+    // Identify changes
     const weapon = this.items.get(itemId, {strict: true});
     const {actionCost, actorUpdates, itemUpdates} = equipped
       ? this.#equipWeapon(weapon, slot)
       : this.#unequipWeapon(weapon);
+
+    // Enforce action cost of equipping for Actors that are in combat
     if ( this.combatant ) {
+      if ( this.system.resources.action.value < actionCost ) {
+        throw new Error(game.i18n.localize("WARNING.CannotEquipActionCost"));
+      }
       await this.alterResources({action: -actionCost}, actorUpdates);
     }
+
+    // Update item equipped state
     await this.updateEmbeddedDocuments("Item", itemUpdates);
   }
 
@@ -2111,9 +2125,6 @@ export default class CrucibleActor extends Actor {
       actorUpdates["system.status.hasMoved"] = true;
     }
     actionCost = Math.max(actionCost, 0);
-    if ( this.system.resources.action.value < actionCost ) {
-      throw new Error(game.i18n.localize("WARNING.CannotEquipActionCost"));
-    }
     return {itemUpdates, actorUpdates, actionCost};
   }
 
diff --git a/packs/adversary-talents/000327.log b/packs/adversary-talents/000335.log
similarity index 100%
rename from packs/adversary-talents/000327.log
rename to packs/adversary-talents/000335.log
diff --git a/packs/adversary-talents/CURRENT b/packs/adversary-talents/CURRENT
index 10383e2e..50ac4e62 100644
--- a/packs/adversary-talents/CURRENT
+++ b/packs/adversary-talents/CURRENT
@@ -1 +1 @@
-MANIFEST-000325
+MANIFEST-000333
diff --git a/packs/adversary-talents/LOG b/packs/adversary-talents/LOG
index d692d460..7c467a96 100644
--- a/packs/adversary-talents/LOG
+++ b/packs/adversary-talents/LOG
@@ -1,8 +1,8 @@
-2023/07/02-12:34:23.605 389a4 Recovering log #323
-2023/07/02-12:34:23.608 389a4 Delete type=0 #323
-2023/07/02-12:34:23.608 389a4 Delete type=3 #321
-2023/07/02-12:57:29.687 8700 Level-0 table #328: started
-2023/07/02-12:57:29.687 8700 Level-0 table #328: 0 bytes OK
-2023/07/02-12:57:29.688 8700 Delete type=0 #326
-2023/07/02-12:57:29.692 8700 Manual compaction at level-0 from '!items!packhunter000000' @ 72057594037927935 : 1 .. '!items!tuskcharge000000' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.692 8700 Manual compaction at level-1 from '!items!packhunter000000' @ 72057594037927935 : 1 .. '!items!tuskcharge000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.951 2f590 Recovering log #331
+2023/07/02-17:19:45.955 2f590 Delete type=0 #331
+2023/07/02-17:19:45.955 2f590 Delete type=3 #329
+2023/07/02-17:20:21.583 8114 Level-0 table #336: started
+2023/07/02-17:20:21.583 8114 Level-0 table #336: 0 bytes OK
+2023/07/02-17:20:21.584 8114 Delete type=0 #334
+2023/07/02-17:20:21.588 8114 Manual compaction at level-0 from '!items!packhunter000000' @ 72057594037927935 : 1 .. '!items!tuskcharge000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.594 8114 Manual compaction at level-1 from '!items!packhunter000000' @ 72057594037927935 : 1 .. '!items!tuskcharge000000' @ 0 : 0; will stop at (end)
diff --git a/packs/adversary-talents/LOG.old b/packs/adversary-talents/LOG.old
index 38737bef..35b5d28d 100644
--- a/packs/adversary-talents/LOG.old
+++ b/packs/adversary-talents/LOG.old
@@ -1,8 +1,8 @@
-2023/07/02-12:02:02.653 2fa48 Recovering log #319
-2023/07/02-12:02:02.658 2fa48 Delete type=0 #319
-2023/07/02-12:02:02.658 2fa48 Delete type=3 #317
-2023/07/02-12:34:02.675 8700 Level-0 table #324: started
-2023/07/02-12:34:02.675 8700 Level-0 table #324: 0 bytes OK
-2023/07/02-12:34:02.676 8700 Delete type=0 #322
-2023/07/02-12:34:02.678 8700 Manual compaction at level-0 from '!items!packhunter000000' @ 72057594037927935 : 1 .. '!items!tuskcharge000000' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.679 8700 Manual compaction at level-1 from '!items!packhunter000000' @ 72057594037927935 : 1 .. '!items!tuskcharge000000' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.031 389a4 Recovering log #327
+2023/07/02-12:57:49.034 389a4 Delete type=0 #327
+2023/07/02-12:57:49.035 389a4 Delete type=3 #325
+2023/07/02-17:18:53.430 8700 Level-0 table #332: started
+2023/07/02-17:18:53.430 8700 Level-0 table #332: 0 bytes OK
+2023/07/02-17:18:53.431 8700 Delete type=0 #330
+2023/07/02-17:18:53.435 8700 Manual compaction at level-0 from '!items!packhunter000000' @ 72057594037927935 : 1 .. '!items!tuskcharge000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.435 8700 Manual compaction at level-1 from '!items!packhunter000000' @ 72057594037927935 : 1 .. '!items!tuskcharge000000' @ 0 : 0; will stop at (end)
diff --git a/packs/adversary-talents/MANIFEST-000325 b/packs/adversary-talents/MANIFEST-000333
similarity index 69%
rename from packs/adversary-talents/MANIFEST-000325
rename to packs/adversary-talents/MANIFEST-000333
index 1ca46226..f9b30a3f 100644
Binary files a/packs/adversary-talents/MANIFEST-000325 and b/packs/adversary-talents/MANIFEST-000333 differ
diff --git a/packs/ancestry/001028.log b/packs/ancestry/001036.log
similarity index 100%
rename from packs/ancestry/001028.log
rename to packs/ancestry/001036.log
diff --git a/packs/ancestry/CURRENT b/packs/ancestry/CURRENT
index 1d2716dc..b822b5af 100644
--- a/packs/ancestry/CURRENT
+++ b/packs/ancestry/CURRENT
@@ -1 +1 @@
-MANIFEST-001026
+MANIFEST-001034
diff --git a/packs/ancestry/LOG b/packs/ancestry/LOG
index 3464412f..32feb842 100644
--- a/packs/ancestry/LOG
+++ b/packs/ancestry/LOG
@@ -1,8 +1,8 @@
-2023/07/02-12:34:23.605 2fa48 Recovering log #1024
-2023/07/02-12:34:23.609 2fa48 Delete type=0 #1024
-2023/07/02-12:34:23.609 2fa48 Delete type=3 #1022
-2023/07/02-12:57:29.688 8700 Level-0 table #1029: started
-2023/07/02-12:57:29.688 8700 Level-0 table #1029: 0 bytes OK
-2023/07/02-12:57:29.689 8700 Delete type=0 #1027
-2023/07/02-12:57:29.692 8700 Manual compaction at level-0 from '!items!devilkin00000000' @ 72057594037927935 : 1 .. '!items!orcish0000000000' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.692 8700 Manual compaction at level-1 from '!items!devilkin00000000' @ 72057594037927935 : 1 .. '!items!orcish0000000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.951 23cb8 Recovering log #1032
+2023/07/02-17:19:45.956 23cb8 Delete type=0 #1032
+2023/07/02-17:19:45.956 23cb8 Delete type=3 #1030
+2023/07/02-17:20:21.594 8114 Level-0 table #1037: started
+2023/07/02-17:20:21.594 8114 Level-0 table #1037: 0 bytes OK
+2023/07/02-17:20:21.595 8114 Delete type=0 #1035
+2023/07/02-17:20:21.598 8114 Manual compaction at level-0 from '!items!devilkin00000000' @ 72057594037927935 : 1 .. '!items!orcish0000000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.600 8114 Manual compaction at level-1 from '!items!devilkin00000000' @ 72057594037927935 : 1 .. '!items!orcish0000000000' @ 0 : 0; will stop at (end)
diff --git a/packs/ancestry/LOG.old b/packs/ancestry/LOG.old
index 7ded9ead..d7203188 100644
--- a/packs/ancestry/LOG.old
+++ b/packs/ancestry/LOG.old
@@ -1,8 +1,8 @@
-2023/07/02-12:02:02.653 2554c Recovering log #1020
-2023/07/02-12:02:02.658 2554c Delete type=0 #1020
-2023/07/02-12:02:02.658 2554c Delete type=3 #1018
-2023/07/02-12:34:02.676 8700 Level-0 table #1025: started
-2023/07/02-12:34:02.676 8700 Level-0 table #1025: 0 bytes OK
-2023/07/02-12:34:02.677 8700 Delete type=0 #1023
-2023/07/02-12:34:02.679 8700 Manual compaction at level-0 from '!items!devilkin00000000' @ 72057594037927935 : 1 .. '!items!orcish0000000000' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.679 8700 Manual compaction at level-1 from '!items!devilkin00000000' @ 72057594037927935 : 1 .. '!items!orcish0000000000' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.031 2554c Recovering log #1028
+2023/07/02-12:57:49.035 2554c Delete type=0 #1028
+2023/07/02-12:57:49.035 2554c Delete type=3 #1026
+2023/07/02-17:18:53.433 8700 Level-0 table #1033: started
+2023/07/02-17:18:53.433 8700 Level-0 table #1033: 0 bytes OK
+2023/07/02-17:18:53.434 8700 Delete type=0 #1031
+2023/07/02-17:18:53.435 8700 Manual compaction at level-0 from '!items!devilkin00000000' @ 72057594037927935 : 1 .. '!items!orcish0000000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.435 8700 Manual compaction at level-1 from '!items!devilkin00000000' @ 72057594037927935 : 1 .. '!items!orcish0000000000' @ 0 : 0; will stop at (end)
diff --git a/packs/ancestry/MANIFEST-001026 b/packs/ancestry/MANIFEST-001034
similarity index 67%
rename from packs/ancestry/MANIFEST-001026
rename to packs/ancestry/MANIFEST-001034
index 64ea32c6..b41cec69 100644
Binary files a/packs/ancestry/MANIFEST-001026 and b/packs/ancestry/MANIFEST-001034 differ
diff --git a/packs/archetype/000408.log b/packs/archetype/000416.log
similarity index 100%
rename from packs/archetype/000408.log
rename to packs/archetype/000416.log
diff --git a/packs/archetype/CURRENT b/packs/archetype/CURRENT
index 9e74f961..0dcdeb54 100644
--- a/packs/archetype/CURRENT
+++ b/packs/archetype/CURRENT
@@ -1 +1 @@
-MANIFEST-000406
+MANIFEST-000414
diff --git a/packs/archetype/LOG b/packs/archetype/LOG
index ab171c77..bc160f94 100644
--- a/packs/archetype/LOG
+++ b/packs/archetype/LOG
@@ -1,7 +1,7 @@
-2023/07/02-12:34:23.611 389a4 Recovering log #404
-2023/07/02-12:34:23.615 389a4 Delete type=0 #404
-2023/07/02-12:34:23.615 389a4 Delete type=3 #402
-2023/07/02-12:57:29.693 8700 Level-0 table #409: started
-2023/07/02-12:57:29.693 8700 Level-0 table #409: 0 bytes OK
-2023/07/02-12:57:29.694 8700 Delete type=0 #407
-2023/07/02-12:57:29.697 8700 Manual compaction at level-0 from '!folders!6Up7ddrphLept3RW' @ 72057594037927935 : 1 .. '!items!tusker0000000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.960 c658 Recovering log #412
+2023/07/02-17:19:45.964 c658 Delete type=0 #412
+2023/07/02-17:19:45.964 c658 Delete type=3 #410
+2023/07/02-17:20:21.595 8114 Level-0 table #417: started
+2023/07/02-17:20:21.595 8114 Level-0 table #417: 0 bytes OK
+2023/07/02-17:20:21.598 8114 Delete type=0 #415
+2023/07/02-17:20:21.600 8114 Manual compaction at level-0 from '!folders!6Up7ddrphLept3RW' @ 72057594037927935 : 1 .. '!items!tusker0000000000' @ 0 : 0; will stop at (end)
diff --git a/packs/archetype/LOG.old b/packs/archetype/LOG.old
index 9826f01f..22b0ce58 100644
--- a/packs/archetype/LOG.old
+++ b/packs/archetype/LOG.old
@@ -1,7 +1,7 @@
-2023/07/02-12:02:02.661 389a4 Recovering log #400
-2023/07/02-12:02:02.664 389a4 Delete type=0 #400
-2023/07/02-12:02:02.664 389a4 Delete type=3 #398
-2023/07/02-12:34:02.677 8700 Level-0 table #405: started
-2023/07/02-12:34:02.677 8700 Level-0 table #405: 0 bytes OK
-2023/07/02-12:34:02.678 8700 Delete type=0 #403
-2023/07/02-12:34:02.679 8700 Manual compaction at level-0 from '!folders!6Up7ddrphLept3RW' @ 72057594037927935 : 1 .. '!items!tusker0000000000' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.038 2fa48 Recovering log #408
+2023/07/02-12:57:49.042 2fa48 Delete type=0 #408
+2023/07/02-12:57:49.042 2fa48 Delete type=3 #406
+2023/07/02-17:18:53.432 8700 Level-0 table #413: started
+2023/07/02-17:18:53.432 8700 Level-0 table #413: 0 bytes OK
+2023/07/02-17:18:53.432 8700 Delete type=0 #411
+2023/07/02-17:18:53.435 8700 Manual compaction at level-0 from '!folders!6Up7ddrphLept3RW' @ 72057594037927935 : 1 .. '!items!tusker0000000000' @ 0 : 0; will stop at (end)
diff --git a/packs/archetype/MANIFEST-000406 b/packs/archetype/MANIFEST-000414
similarity index 58%
rename from packs/archetype/MANIFEST-000406
rename to packs/archetype/MANIFEST-000414
index 0f5e5a22..d4b71b0f 100644
Binary files a/packs/archetype/MANIFEST-000406 and b/packs/archetype/MANIFEST-000414 differ
diff --git a/packs/armor/001027.log b/packs/armor/001035.log
similarity index 100%
rename from packs/armor/001027.log
rename to packs/armor/001035.log
diff --git a/packs/armor/CURRENT b/packs/armor/CURRENT
index b6db05eb..53184658 100644
--- a/packs/armor/CURRENT
+++ b/packs/armor/CURRENT
@@ -1 +1 @@
-MANIFEST-001025
+MANIFEST-001033
diff --git a/packs/armor/LOG b/packs/armor/LOG
index b7d396ef..c6b8aa9a 100644
--- a/packs/armor/LOG
+++ b/packs/armor/LOG
@@ -1,8 +1,8 @@
-2023/07/02-12:34:23.611 2554c Recovering log #1023
-2023/07/02-12:34:23.616 2554c Delete type=0 #1023
-2023/07/02-12:34:23.616 2554c Delete type=3 #1021
-2023/07/02-12:57:29.694 8700 Level-0 table #1028: started
-2023/07/02-12:57:29.694 8700 Level-0 table #1028: 0 bytes OK
-2023/07/02-12:57:29.695 8700 Delete type=0 #1026
-2023/07/02-12:57:29.697 8700 Manual compaction at level-0 from '!folders!HVRX1hdeNtvlHbQs' @ 72057594037927935 : 1 .. '!items!studdedleatherar' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.697 8700 Manual compaction at level-1 from '!folders!HVRX1hdeNtvlHbQs' @ 72057594037927935 : 1 .. '!items!studdedleatherar' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.960 23cb8 Recovering log #1031
+2023/07/02-17:19:45.965 23cb8 Delete type=0 #1031
+2023/07/02-17:19:45.965 23cb8 Delete type=3 #1029
+2023/07/02-17:20:21.598 8114 Level-0 table #1036: started
+2023/07/02-17:20:21.598 8114 Level-0 table #1036: 0 bytes OK
+2023/07/02-17:20:21.599 8114 Delete type=0 #1034
+2023/07/02-17:20:21.600 8114 Manual compaction at level-0 from '!folders!HVRX1hdeNtvlHbQs' @ 72057594037927935 : 1 .. '!items!studdedleatherar' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.600 8114 Manual compaction at level-1 from '!folders!HVRX1hdeNtvlHbQs' @ 72057594037927935 : 1 .. '!items!studdedleatherar' @ 0 : 0; will stop at (end)
diff --git a/packs/armor/LOG.old b/packs/armor/LOG.old
index c8869a8c..60ddcd5f 100644
--- a/packs/armor/LOG.old
+++ b/packs/armor/LOG.old
@@ -1,8 +1,8 @@
-2023/07/02-12:02:02.661 2fe90 Recovering log #1019
-2023/07/02-12:02:02.664 2fe90 Delete type=0 #1019
-2023/07/02-12:02:02.664 2fe90 Delete type=3 #1017
-2023/07/02-12:34:02.678 8700 Level-0 table #1024: started
-2023/07/02-12:34:02.678 8700 Level-0 table #1024: 0 bytes OK
-2023/07/02-12:34:02.679 8700 Delete type=0 #1022
-2023/07/02-12:34:02.679 8700 Manual compaction at level-0 from '!folders!HVRX1hdeNtvlHbQs' @ 72057594037927935 : 1 .. '!items!studdedleatherar' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.679 8700 Manual compaction at level-1 from '!folders!HVRX1hdeNtvlHbQs' @ 72057594037927935 : 1 .. '!items!studdedleatherar' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.038 2fe90 Recovering log #1027
+2023/07/02-12:57:49.042 2fe90 Delete type=0 #1027
+2023/07/02-12:57:49.042 2fe90 Delete type=3 #1025
+2023/07/02-17:18:53.434 8700 Level-0 table #1032: started
+2023/07/02-17:18:53.434 8700 Level-0 table #1032: 0 bytes OK
+2023/07/02-17:18:53.435 8700 Delete type=0 #1030
+2023/07/02-17:18:53.435 8700 Manual compaction at level-0 from '!folders!HVRX1hdeNtvlHbQs' @ 72057594037927935 : 1 .. '!items!studdedleatherar' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.435 8700 Manual compaction at level-1 from '!folders!HVRX1hdeNtvlHbQs' @ 72057594037927935 : 1 .. '!items!studdedleatherar' @ 0 : 0; will stop at (end)
diff --git a/packs/armor/MANIFEST-001025 b/packs/armor/MANIFEST-001033
similarity index 60%
rename from packs/armor/MANIFEST-001025
rename to packs/armor/MANIFEST-001033
index 824d4dd8..a5cf2f75 100644
Binary files a/packs/armor/MANIFEST-001025 and b/packs/armor/MANIFEST-001033 differ
diff --git a/packs/background/001028.log b/packs/background/001036.log
similarity index 100%
rename from packs/background/001028.log
rename to packs/background/001036.log
diff --git a/packs/background/CURRENT b/packs/background/CURRENT
index 1d2716dc..b822b5af 100644
--- a/packs/background/CURRENT
+++ b/packs/background/CURRENT
@@ -1 +1 @@
-MANIFEST-001026
+MANIFEST-001034
diff --git a/packs/background/LOG b/packs/background/LOG
index ba5bdb2a..5ffc1a61 100644
--- a/packs/background/LOG
+++ b/packs/background/LOG
@@ -1,8 +1,8 @@
-2023/07/02-12:34:23.618 389a4 Recovering log #1024
-2023/07/02-12:34:23.621 389a4 Delete type=0 #1024
-2023/07/02-12:34:23.621 389a4 Delete type=3 #1022
-2023/07/02-12:57:29.695 8700 Level-0 table #1029: started
-2023/07/02-12:57:29.695 8700 Level-0 table #1029: 0 bytes OK
-2023/07/02-12:57:29.696 8700 Delete type=0 #1027
-2023/07/02-12:57:29.697 8700 Manual compaction at level-0 from '!items!acolyte000000000' @ 72057594037927935 : 1 .. '!items!wanderer00000000' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.697 8700 Manual compaction at level-1 from '!items!acolyte000000000' @ 72057594037927935 : 1 .. '!items!wanderer00000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.967 2f590 Recovering log #1032
+2023/07/02-17:19:45.971 2f590 Delete type=0 #1032
+2023/07/02-17:19:45.971 2f590 Delete type=3 #1030
+2023/07/02-17:20:21.599 8114 Level-0 table #1037: started
+2023/07/02-17:20:21.599 8114 Level-0 table #1037: 0 bytes OK
+2023/07/02-17:20:21.600 8114 Delete type=0 #1035
+2023/07/02-17:20:21.600 8114 Manual compaction at level-0 from '!items!acolyte000000000' @ 72057594037927935 : 1 .. '!items!wanderer00000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.600 8114 Manual compaction at level-1 from '!items!acolyte000000000' @ 72057594037927935 : 1 .. '!items!wanderer00000000' @ 0 : 0; will stop at (end)
diff --git a/packs/background/LOG.old b/packs/background/LOG.old
index 453ff24a..b92ae02a 100644
--- a/packs/background/LOG.old
+++ b/packs/background/LOG.old
@@ -1,8 +1,8 @@
-2023/07/02-12:02:02.667 2554c Recovering log #1020
-2023/07/02-12:02:02.671 2554c Delete type=0 #1020
-2023/07/02-12:02:02.671 2554c Delete type=3 #1018
-2023/07/02-12:34:02.679 8700 Level-0 table #1025: started
-2023/07/02-12:34:02.680 8700 Level-0 table #1025: 0 bytes OK
-2023/07/02-12:34:02.681 8700 Delete type=0 #1023
-2023/07/02-12:34:02.686 8700 Manual compaction at level-0 from '!items!acolyte000000000' @ 72057594037927935 : 1 .. '!items!wanderer00000000' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.686 8700 Manual compaction at level-1 from '!items!acolyte000000000' @ 72057594037927935 : 1 .. '!items!wanderer00000000' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.045 2554c Recovering log #1028
+2023/07/02-12:57:49.049 2554c Delete type=0 #1028
+2023/07/02-12:57:49.049 2554c Delete type=3 #1026
+2023/07/02-17:18:53.436 8700 Level-0 table #1033: started
+2023/07/02-17:18:53.436 8700 Level-0 table #1033: 0 bytes OK
+2023/07/02-17:18:53.438 8700 Delete type=0 #1031
+2023/07/02-17:18:53.446 8700 Manual compaction at level-0 from '!items!acolyte000000000' @ 72057594037927935 : 1 .. '!items!wanderer00000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.446 8700 Manual compaction at level-1 from '!items!acolyte000000000' @ 72057594037927935 : 1 .. '!items!wanderer00000000' @ 0 : 0; will stop at (end)
diff --git a/packs/background/MANIFEST-001026 b/packs/background/MANIFEST-001034
similarity index 61%
rename from packs/background/MANIFEST-001026
rename to packs/background/MANIFEST-001034
index 0e359961..600d534f 100644
Binary files a/packs/background/MANIFEST-001026 and b/packs/background/MANIFEST-001034 differ
diff --git a/packs/playtest/000164.ldb b/packs/playtest/000164.ldb
deleted file mode 100644
index 6de5006e..00000000
Binary files a/packs/playtest/000164.ldb and /dev/null differ
diff --git a/packs/playtest/000219.log b/packs/playtest/000227.log
similarity index 100%
rename from packs/playtest/000219.log
rename to packs/playtest/000227.log
diff --git a/packs/playtest/000229.ldb b/packs/playtest/000229.ldb
new file mode 100644
index 00000000..1219f4d8
Binary files /dev/null and b/packs/playtest/000229.ldb differ
diff --git a/packs/playtest/CURRENT b/packs/playtest/CURRENT
index 9aabe0cd..0fb0168e 100644
--- a/packs/playtest/CURRENT
+++ b/packs/playtest/CURRENT
@@ -1 +1 @@
-MANIFEST-000217
+MANIFEST-000225
diff --git a/packs/playtest/LOG b/packs/playtest/LOG
index 30144e93..0650852e 100644
--- a/packs/playtest/LOG
+++ b/packs/playtest/LOG
@@ -1,8 +1,15 @@
-2023/07/02-12:34:23.625 2fe90 Recovering log #215
-2023/07/02-12:34:23.629 2fe90 Delete type=0 #215
-2023/07/02-12:34:23.629 2fe90 Delete type=3 #213
-2023/07/02-12:57:29.729 8700 Level-0 table #220: started
-2023/07/02-12:57:29.729 8700 Level-0 table #220: 0 bytes OK
-2023/07/02-12:57:29.731 8700 Delete type=0 #218
-2023/07/02-12:57:29.731 8700 Manual compaction at level-0 from '!adventures!F8AILycmdj2kuOVa' @ 72057594037927935 : 1 .. '!adventures!F8AILycmdj2kuOVa' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.731 8700 Manual compaction at level-1 from '!adventures!F8AILycmdj2kuOVa' @ 72057594037927935 : 1 .. '!adventures!F8AILycmdj2kuOVa' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.974 c658 Recovering log #223
+2023/07/02-17:19:45.978 c658 Delete type=0 #223
+2023/07/02-17:19:45.978 c658 Delete type=3 #221
+2023/07/02-17:20:21.616 8114 Level-0 table #228: started
+2023/07/02-17:20:21.618 8114 Level-0 table #228: 112345 bytes OK
+2023/07/02-17:20:21.620 8114 Delete type=0 #226
+2023/07/02-17:20:21.620 8114 Manual compaction at level-0 from '!adventures!F8AILycmdj2kuOVa' @ 72057594037927935 : 1 .. '!adventures!F8AILycmdj2kuOVa' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.620 8114 Manual compaction at level-1 from '!adventures!F8AILycmdj2kuOVa' @ 72057594037927935 : 1 .. '!adventures!F8AILycmdj2kuOVa' @ 0 : 0; will stop at '!adventures!F8AILycmdj2kuOVa' @ 8 : 1
+2023/07/02-17:20:21.620 8114 Compacting 1@1 + 1@2 files
+2023/07/02-17:20:21.624 8114 Generated table #229@1: 1 keys, 112345 bytes
+2023/07/02-17:20:21.624 8114 Compacted 1@1 + 1@2 files => 112345 bytes
+2023/07/02-17:20:21.625 8114 compacted to: files[ 0 0 1 0 0 0 0 ]
+2023/07/02-17:20:21.625 8114 Delete type=2 #164
+2023/07/02-17:20:21.627 8114 Delete type=2 #228
+2023/07/02-17:20:21.627 8114 Manual compaction at level-1 from '!adventures!F8AILycmdj2kuOVa' @ 8 : 1 .. '!adventures!F8AILycmdj2kuOVa' @ 0 : 0; will stop at (end)
diff --git a/packs/playtest/LOG.old b/packs/playtest/LOG.old
index 3116c75a..fb5f1a5a 100644
--- a/packs/playtest/LOG.old
+++ b/packs/playtest/LOG.old
@@ -1,8 +1,8 @@
-2023/07/02-12:02:02.676 2fe90 Recovering log #211
-2023/07/02-12:02:02.680 2fe90 Delete type=0 #211
-2023/07/02-12:02:02.680 2fe90 Delete type=3 #209
-2023/07/02-12:34:02.718 8700 Level-0 table #216: started
-2023/07/02-12:34:02.718 8700 Level-0 table #216: 0 bytes OK
-2023/07/02-12:34:02.721 8700 Delete type=0 #214
-2023/07/02-12:34:02.721 8700 Manual compaction at level-0 from '!adventures!F8AILycmdj2kuOVa' @ 72057594037927935 : 1 .. '!adventures!F8AILycmdj2kuOVa' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.721 8700 Manual compaction at level-1 from '!adventures!F8AILycmdj2kuOVa' @ 72057594037927935 : 1 .. '!adventures!F8AILycmdj2kuOVa' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.054 2fe90 Recovering log #219
+2023/07/02-12:57:49.058 2fe90 Delete type=0 #219
+2023/07/02-12:57:49.058 2fe90 Delete type=3 #217
+2023/07/02-17:18:53.476 8700 Level-0 table #224: started
+2023/07/02-17:18:53.476 8700 Level-0 table #224: 0 bytes OK
+2023/07/02-17:18:53.478 8700 Delete type=0 #222
+2023/07/02-17:18:53.478 8700 Manual compaction at level-0 from '!adventures!F8AILycmdj2kuOVa' @ 72057594037927935 : 1 .. '!adventures!F8AILycmdj2kuOVa' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.478 8700 Manual compaction at level-1 from '!adventures!F8AILycmdj2kuOVa' @ 72057594037927935 : 1 .. '!adventures!F8AILycmdj2kuOVa' @ 0 : 0; will stop at (end)
diff --git a/packs/playtest/MANIFEST-000217 b/packs/playtest/MANIFEST-000217
deleted file mode 100644
index 2a48a336..00000000
Binary files a/packs/playtest/MANIFEST-000217 and /dev/null differ
diff --git a/packs/playtest/MANIFEST-000225 b/packs/playtest/MANIFEST-000225
new file mode 100644
index 00000000..ef052f25
Binary files /dev/null and b/packs/playtest/MANIFEST-000225 differ
diff --git a/packs/pregens/000591.log b/packs/pregens/000599.log
similarity index 100%
rename from packs/pregens/000591.log
rename to packs/pregens/000599.log
diff --git a/packs/pregens/CURRENT b/packs/pregens/CURRENT
index 9c7b9eaf..f61c7755 100644
--- a/packs/pregens/CURRENT
+++ b/packs/pregens/CURRENT
@@ -1 +1 @@
-MANIFEST-000589
+MANIFEST-000597
diff --git a/packs/pregens/LOG b/packs/pregens/LOG
index 3b3aae4a..1444ce8f 100644
--- a/packs/pregens/LOG
+++ b/packs/pregens/LOG
@@ -1,8 +1,8 @@
-2023/07/02-12:34:23.627 2fa48 Recovering log #587
-2023/07/02-12:34:23.630 2fa48 Delete type=0 #587
-2023/07/02-12:34:23.630 2fa48 Delete type=3 #585
-2023/07/02-12:57:29.698 8700 Level-0 table #592: started
-2023/07/02-12:57:29.698 8700 Level-0 table #592: 0 bytes OK
-2023/07/02-12:57:29.699 8700 Delete type=0 #590
-2023/07/02-12:57:29.702 8700 Manual compaction at level-0 from '!actors!3nHQrIU9vj5vIfSU' @ 72057594037927935 : 1 .. '!folders!xoE3iSbPfFPlq6wD' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.702 8700 Manual compaction at level-1 from '!actors!3nHQrIU9vj5vIfSU' @ 72057594037927935 : 1 .. '!folders!xoE3iSbPfFPlq6wD' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.974 2f590 Recovering log #595
+2023/07/02-17:19:45.978 2f590 Delete type=0 #595
+2023/07/02-17:19:45.978 2f590 Delete type=3 #593
+2023/07/02-17:20:21.600 8114 Level-0 table #600: started
+2023/07/02-17:20:21.600 8114 Level-0 table #600: 0 bytes OK
+2023/07/02-17:20:21.602 8114 Delete type=0 #598
+2023/07/02-17:20:21.605 8114 Manual compaction at level-0 from '!actors!3nHQrIU9vj5vIfSU' @ 72057594037927935 : 1 .. '!folders!xoE3iSbPfFPlq6wD' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.605 8114 Manual compaction at level-1 from '!actors!3nHQrIU9vj5vIfSU' @ 72057594037927935 : 1 .. '!folders!xoE3iSbPfFPlq6wD' @ 0 : 0; will stop at (end)
diff --git a/packs/pregens/LOG.old b/packs/pregens/LOG.old
index 8e324be2..3f040b48 100644
--- a/packs/pregens/LOG.old
+++ b/packs/pregens/LOG.old
@@ -1,8 +1,8 @@
-2023/07/02-12:02:02.677 389a4 Recovering log #583
-2023/07/02-12:02:02.681 389a4 Delete type=0 #583
-2023/07/02-12:02:02.681 389a4 Delete type=3 #581
-2023/07/02-12:34:02.684 8700 Level-0 table #588: started
-2023/07/02-12:34:02.684 8700 Level-0 table #588: 0 bytes OK
-2023/07/02-12:34:02.685 8700 Delete type=0 #586
-2023/07/02-12:34:02.686 8700 Manual compaction at level-0 from '!actors!3nHQrIU9vj5vIfSU' @ 72057594037927935 : 1 .. '!folders!xoE3iSbPfFPlq6wD' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.692 8700 Manual compaction at level-1 from '!actors!3nHQrIU9vj5vIfSU' @ 72057594037927935 : 1 .. '!folders!xoE3iSbPfFPlq6wD' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.054 2fa48 Recovering log #591
+2023/07/02-12:57:49.058 2fa48 Delete type=0 #591
+2023/07/02-12:57:49.058 2fa48 Delete type=3 #589
+2023/07/02-17:18:53.439 8700 Level-0 table #596: started
+2023/07/02-17:18:53.439 8700 Level-0 table #596: 0 bytes OK
+2023/07/02-17:18:53.441 8700 Delete type=0 #594
+2023/07/02-17:18:53.446 8700 Manual compaction at level-0 from '!actors!3nHQrIU9vj5vIfSU' @ 72057594037927935 : 1 .. '!folders!xoE3iSbPfFPlq6wD' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.446 8700 Manual compaction at level-1 from '!actors!3nHQrIU9vj5vIfSU' @ 72057594037927935 : 1 .. '!folders!xoE3iSbPfFPlq6wD' @ 0 : 0; will stop at (end)
diff --git a/packs/pregens/MANIFEST-000589 b/packs/pregens/MANIFEST-000597
similarity index 59%
rename from packs/pregens/MANIFEST-000589
rename to packs/pregens/MANIFEST-000597
index 2fd208c1..a2bf6455 100644
Binary files a/packs/pregens/MANIFEST-000589 and b/packs/pregens/MANIFEST-000597 differ
diff --git a/packs/rules/001075.ldb b/packs/rules/001084.ldb
similarity index 95%
rename from packs/rules/001075.ldb
rename to packs/rules/001084.ldb
index 6267f5b7..d3068f74 100644
Binary files a/packs/rules/001075.ldb and b/packs/rules/001084.ldb differ
diff --git a/packs/rules/001078.log b/packs/rules/001087.log
similarity index 100%
rename from packs/rules/001078.log
rename to packs/rules/001087.log
diff --git a/packs/rules/CURRENT b/packs/rules/CURRENT
index c9bed334..50d467c3 100644
--- a/packs/rules/CURRENT
+++ b/packs/rules/CURRENT
@@ -1 +1 @@
-MANIFEST-001076
+MANIFEST-001085
diff --git a/packs/rules/LOG b/packs/rules/LOG
index 09b76e8d..c4945ec2 100644
--- a/packs/rules/LOG
+++ b/packs/rules/LOG
@@ -1,8 +1,8 @@
-2023/07/02-12:34:23.619 2fa48 Recovering log #1073
-2023/07/02-12:34:23.623 2fa48 Delete type=0 #1073
-2023/07/02-12:34:23.623 2fa48 Delete type=3 #1071
-2023/07/02-12:57:29.696 8700 Level-0 table #1079: started
-2023/07/02-12:57:29.696 8700 Level-0 table #1079: 0 bytes OK
-2023/07/02-12:57:29.697 8700 Delete type=0 #1077
-2023/07/02-12:57:29.697 8700 Manual compaction at level-0 from '!folders!MMeWpMmsLOblp07U' @ 72057594037927935 : 1 .. '!journal.pages!veKSDiOWHLaF7Gok.OmJNyYrgeaTwYE7L' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.697 8700 Manual compaction at level-1 from '!folders!MMeWpMmsLOblp07U' @ 72057594037927935 : 1 .. '!journal.pages!veKSDiOWHLaF7Gok.OmJNyYrgeaTwYE7L' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.967 23cb8 Recovering log #1082
+2023/07/02-17:19:45.971 23cb8 Delete type=0 #1082
+2023/07/02-17:19:45.971 23cb8 Delete type=3 #1080
+2023/07/02-17:20:21.602 8114 Level-0 table #1088: started
+2023/07/02-17:20:21.602 8114 Level-0 table #1088: 0 bytes OK
+2023/07/02-17:20:21.603 8114 Delete type=0 #1086
+2023/07/02-17:20:21.605 8114 Manual compaction at level-0 from '!folders!MMeWpMmsLOblp07U' @ 72057594037927935 : 1 .. '!journal.pages!veKSDiOWHLaF7Gok.OmJNyYrgeaTwYE7L' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.605 8114 Manual compaction at level-1 from '!folders!MMeWpMmsLOblp07U' @ 72057594037927935 : 1 .. '!journal.pages!veKSDiOWHLaF7Gok.OmJNyYrgeaTwYE7L' @ 0 : 0; will stop at (end)
diff --git a/packs/rules/LOG.old b/packs/rules/LOG.old
index 2b2d5da7..c3c1f5cb 100644
--- a/packs/rules/LOG.old
+++ b/packs/rules/LOG.old
@@ -1,15 +1,15 @@
-2023/07/02-12:02:02.667 2fa48 Recovering log #1069
-2023/07/02-12:02:02.671 2fa48 Delete type=0 #1069
-2023/07/02-12:02:02.671 2fa48 Delete type=3 #1067
-2023/07/02-12:34:02.681 8700 Level-0 table #1074: started
-2023/07/02-12:34:02.683 8700 Level-0 table #1074: 91300 bytes OK
-2023/07/02-12:34:02.684 8700 Delete type=0 #1072
-2023/07/02-12:34:02.686 8700 Manual compaction at level-0 from '!folders!MMeWpMmsLOblp07U' @ 72057594037927935 : 1 .. '!journal.pages!veKSDiOWHLaF7Gok.OmJNyYrgeaTwYE7L' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.686 8700 Manual compaction at level-1 from '!folders!MMeWpMmsLOblp07U' @ 72057594037927935 : 1 .. '!journal.pages!veKSDiOWHLaF7Gok.OmJNyYrgeaTwYE7L' @ 0 : 0; will stop at '!journal.pages!qjTSKlh59JhtUuEr.p3hKRiZN3x0DEtyG' @ 7335 : 1
-2023/07/02-12:34:02.686 8700 Compacting 1@1 + 1@2 files
-2023/07/02-12:34:02.690 8700 Generated table #1075@1: 68 keys, 143855 bytes
-2023/07/02-12:34:02.690 8700 Compacted 1@1 + 1@2 files => 143855 bytes
-2023/07/02-12:34:02.691 8700 compacted to: files[ 0 0 1 0 0 0 0 ]
-2023/07/02-12:34:02.691 8700 Delete type=2 #1066
-2023/07/02-12:34:02.692 8700 Delete type=2 #1074
-2023/07/02-12:34:02.693 8700 Manual compaction at level-1 from '!journal.pages!qjTSKlh59JhtUuEr.p3hKRiZN3x0DEtyG' @ 7335 : 1 .. '!journal.pages!veKSDiOWHLaF7Gok.OmJNyYrgeaTwYE7L' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.045 389a4 Recovering log #1078
+2023/07/02-12:57:49.049 389a4 Delete type=0 #1078
+2023/07/02-12:57:49.049 389a4 Delete type=3 #1076
+2023/07/02-17:18:53.443 8700 Level-0 table #1083: started
+2023/07/02-17:18:53.445 8700 Level-0 table #1083: 8562 bytes OK
+2023/07/02-17:18:53.446 8700 Delete type=0 #1081
+2023/07/02-17:18:53.446 8700 Manual compaction at level-0 from '!folders!MMeWpMmsLOblp07U' @ 72057594037927935 : 1 .. '!journal.pages!veKSDiOWHLaF7Gok.OmJNyYrgeaTwYE7L' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.446 8700 Manual compaction at level-1 from '!folders!MMeWpMmsLOblp07U' @ 72057594037927935 : 1 .. '!journal.pages!veKSDiOWHLaF7Gok.OmJNyYrgeaTwYE7L' @ 0 : 0; will stop at '!journal.pages!gszlBVQ5fGh3y0I6.DjePpoV2oJenlyTf' @ 7361 : 1
+2023/07/02-17:18:53.446 8700 Compacting 1@1 + 1@2 files
+2023/07/02-17:18:53.448 8700 Generated table #1084@1: 68 keys, 143807 bytes
+2023/07/02-17:18:53.448 8700 Compacted 1@1 + 1@2 files => 143807 bytes
+2023/07/02-17:18:53.449 8700 compacted to: files[ 0 0 1 0 0 0 0 ]
+2023/07/02-17:18:53.449 8700 Delete type=2 #1075
+2023/07/02-17:18:53.449 8700 Delete type=2 #1083
+2023/07/02-17:18:53.454 8700 Manual compaction at level-1 from '!journal.pages!gszlBVQ5fGh3y0I6.DjePpoV2oJenlyTf' @ 7361 : 1 .. '!journal.pages!veKSDiOWHLaF7Gok.OmJNyYrgeaTwYE7L' @ 0 : 0; will stop at (end)
diff --git a/packs/rules/MANIFEST-001076 b/packs/rules/MANIFEST-001076
deleted file mode 100644
index 4f41f799..00000000
Binary files a/packs/rules/MANIFEST-001076 and /dev/null differ
diff --git a/packs/rules/MANIFEST-001085 b/packs/rules/MANIFEST-001085
new file mode 100644
index 00000000..de1d2264
Binary files /dev/null and b/packs/rules/MANIFEST-001085 differ
diff --git a/packs/summons/000612.log b/packs/summons/000620.log
similarity index 100%
rename from packs/summons/000612.log
rename to packs/summons/000620.log
diff --git a/packs/summons/CURRENT b/packs/summons/CURRENT
index dbeaa5f1..bb61cf20 100644
--- a/packs/summons/CURRENT
+++ b/packs/summons/CURRENT
@@ -1 +1 @@
-MANIFEST-000610
+MANIFEST-000618
diff --git a/packs/summons/LOG b/packs/summons/LOG
index b6c5db3b..367ce869 100644
--- a/packs/summons/LOG
+++ b/packs/summons/LOG
@@ -1,8 +1,8 @@
-2023/07/02-12:34:23.631 389a4 Recovering log #608
-2023/07/02-12:34:23.635 389a4 Delete type=0 #608
-2023/07/02-12:34:23.635 389a4 Delete type=3 #606
-2023/07/02-12:57:29.699 8700 Level-0 table #613: started
-2023/07/02-12:57:29.699 8700 Level-0 table #613: 0 bytes OK
-2023/07/02-12:57:29.700 8700 Delete type=0 #611
-2023/07/02-12:57:29.702 8700 Manual compaction at level-0 from '!actors!56puGK932Qc0cowe' @ 72057594037927935 : 1 .. '!folders!5oBBNdq95OvvXx3e' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.703 8700 Manual compaction at level-1 from '!actors!56puGK932Qc0cowe' @ 72057594037927935 : 1 .. '!folders!5oBBNdq95OvvXx3e' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.980 23cb8 Recovering log #616
+2023/07/02-17:19:45.983 23cb8 Delete type=0 #616
+2023/07/02-17:19:45.983 23cb8 Delete type=3 #614
+2023/07/02-17:20:21.603 8114 Level-0 table #621: started
+2023/07/02-17:20:21.603 8114 Level-0 table #621: 0 bytes OK
+2023/07/02-17:20:21.604 8114 Delete type=0 #619
+2023/07/02-17:20:21.605 8114 Manual compaction at level-0 from '!actors!56puGK932Qc0cowe' @ 72057594037927935 : 1 .. '!folders!5oBBNdq95OvvXx3e' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.605 8114 Manual compaction at level-1 from '!actors!56puGK932Qc0cowe' @ 72057594037927935 : 1 .. '!folders!5oBBNdq95OvvXx3e' @ 0 : 0; will stop at (end)
diff --git a/packs/summons/LOG.old b/packs/summons/LOG.old
index 118d4298..8b1be760 100644
--- a/packs/summons/LOG.old
+++ b/packs/summons/LOG.old
@@ -1,8 +1,8 @@
-2023/07/02-12:02:02.682 2fa48 Recovering log #604
-2023/07/02-12:02:02.686 2fa48 Delete type=0 #604
-2023/07/02-12:02:02.686 2fa48 Delete type=3 #602
-2023/07/02-12:34:02.685 8700 Level-0 table #609: started
-2023/07/02-12:34:02.685 8700 Level-0 table #609: 0 bytes OK
-2023/07/02-12:34:02.686 8700 Delete type=0 #607
-2023/07/02-12:34:02.686 8700 Manual compaction at level-0 from '!actors!56puGK932Qc0cowe' @ 72057594037927935 : 1 .. '!folders!5oBBNdq95OvvXx3e' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.692 8700 Manual compaction at level-1 from '!actors!56puGK932Qc0cowe' @ 72057594037927935 : 1 .. '!folders!5oBBNdq95OvvXx3e' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.060 389a4 Recovering log #612
+2023/07/02-12:57:49.063 389a4 Delete type=0 #612
+2023/07/02-12:57:49.063 389a4 Delete type=3 #610
+2023/07/02-17:18:53.441 8700 Level-0 table #617: started
+2023/07/02-17:18:53.441 8700 Level-0 table #617: 0 bytes OK
+2023/07/02-17:18:53.443 8700 Delete type=0 #615
+2023/07/02-17:18:53.446 8700 Manual compaction at level-0 from '!actors!56puGK932Qc0cowe' @ 72057594037927935 : 1 .. '!folders!5oBBNdq95OvvXx3e' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.446 8700 Manual compaction at level-1 from '!actors!56puGK932Qc0cowe' @ 72057594037927935 : 1 .. '!folders!5oBBNdq95OvvXx3e' @ 0 : 0; will stop at (end)
diff --git a/packs/summons/MANIFEST-000610 b/packs/summons/MANIFEST-000618
similarity index 81%
rename from packs/summons/MANIFEST-000610
rename to packs/summons/MANIFEST-000618
index e63ebfcd..1147360b 100644
Binary files a/packs/summons/MANIFEST-000610 and b/packs/summons/MANIFEST-000618 differ
diff --git a/packs/talent/001109.ldb b/packs/talent/001126.ldb
similarity index 94%
rename from packs/talent/001109.ldb
rename to packs/talent/001126.ldb
index ab4cecc7..9a51ee44 100644
Binary files a/packs/talent/001109.ldb and b/packs/talent/001126.ldb differ
diff --git a/packs/talent/001120.log b/packs/talent/001129.log
similarity index 100%
rename from packs/talent/001120.log
rename to packs/talent/001129.log
diff --git a/packs/talent/CURRENT b/packs/talent/CURRENT
index 34782baf..ce832f55 100644
--- a/packs/talent/CURRENT
+++ b/packs/talent/CURRENT
@@ -1 +1 @@
-MANIFEST-001118
+MANIFEST-001127
diff --git a/packs/talent/LOG b/packs/talent/LOG
index abff8a5e..f1da0450 100644
--- a/packs/talent/LOG
+++ b/packs/talent/LOG
@@ -1,8 +1,8 @@
-2023/07/02-12:34:23.634 2fa48 Recovering log #1116
-2023/07/02-12:34:23.637 2fa48 Delete type=0 #1116
-2023/07/02-12:34:23.637 2fa48 Delete type=3 #1114
-2023/07/02-12:57:29.700 8700 Level-0 table #1121: started
-2023/07/02-12:57:29.700 8700 Level-0 table #1121: 0 bytes OK
-2023/07/02-12:57:29.701 8700 Delete type=0 #1119
-2023/07/02-12:57:29.702 8700 Manual compaction at level-0 from '!folders!08mOaWGw5rYKejer' @ 72057594037927935 : 1 .. '!items!zealoussmite0000' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.703 8700 Manual compaction at level-1 from '!folders!08mOaWGw5rYKejer' @ 72057594037927935 : 1 .. '!items!zealoussmite0000' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.982 2f590 Recovering log #1124
+2023/07/02-17:19:45.985 2f590 Delete type=0 #1124
+2023/07/02-17:19:45.985 2f590 Delete type=3 #1122
+2023/07/02-17:20:21.604 8114 Level-0 table #1130: started
+2023/07/02-17:20:21.604 8114 Level-0 table #1130: 0 bytes OK
+2023/07/02-17:20:21.605 8114 Delete type=0 #1128
+2023/07/02-17:20:21.605 8114 Manual compaction at level-0 from '!folders!08mOaWGw5rYKejer' @ 72057594037927935 : 1 .. '!items!zealoussmite0000' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.605 8114 Manual compaction at level-1 from '!folders!08mOaWGw5rYKejer' @ 72057594037927935 : 1 .. '!items!zealoussmite0000' @ 0 : 0; will stop at (end)
diff --git a/packs/talent/LOG.old b/packs/talent/LOG.old
index 13b10211..54cc9542 100644
--- a/packs/talent/LOG.old
+++ b/packs/talent/LOG.old
@@ -1,8 +1,15 @@
-2023/07/02-12:02:02.685 389a4 Recovering log #1112
-2023/07/02-12:02:02.688 389a4 Delete type=0 #1112
-2023/07/02-12:02:02.688 389a4 Delete type=3 #1110
-2023/07/02-12:34:02.692 8700 Level-0 table #1117: started
-2023/07/02-12:34:02.692 8700 Level-0 table #1117: 0 bytes OK
-2023/07/02-12:34:02.693 8700 Delete type=0 #1115
-2023/07/02-12:34:02.696 8700 Manual compaction at level-0 from '!folders!08mOaWGw5rYKejer' @ 72057594037927935 : 1 .. '!items!zealoussmite0000' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.697 8700 Manual compaction at level-1 from '!folders!08mOaWGw5rYKejer' @ 72057594037927935 : 1 .. '!items!zealoussmite0000' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.061 2fe90 Recovering log #1120
+2023/07/02-12:57:49.065 2fe90 Delete type=0 #1120
+2023/07/02-12:57:49.065 2fe90 Delete type=3 #1118
+2023/07/02-17:18:53.450 8700 Level-0 table #1125: started
+2023/07/02-17:18:53.451 8700 Level-0 table #1125: 1492 bytes OK
+2023/07/02-17:18:53.452 8700 Delete type=0 #1123
+2023/07/02-17:18:53.454 8700 Manual compaction at level-0 from '!folders!08mOaWGw5rYKejer' @ 72057594037927935 : 1 .. '!items!zealoussmite0000' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.454 8700 Manual compaction at level-1 from '!folders!08mOaWGw5rYKejer' @ 72057594037927935 : 1 .. '!items!zealoussmite0000' @ 0 : 0; will stop at '!items!ruthlessmomentum' @ 1759 : 1
+2023/07/02-17:18:53.454 8700 Compacting 1@1 + 1@2 files
+2023/07/02-17:18:53.456 8700 Generated table #1126@1: 212 keys, 90076 bytes
+2023/07/02-17:18:53.456 8700 Compacted 1@1 + 1@2 files => 90076 bytes
+2023/07/02-17:18:53.456 8700 compacted to: files[ 0 0 1 0 0 0 0 ]
+2023/07/02-17:18:53.457 8700 Delete type=2 #1109
+2023/07/02-17:18:53.457 8700 Delete type=2 #1125
+2023/07/02-17:18:53.459 8700 Manual compaction at level-1 from '!items!ruthlessmomentum' @ 1759 : 1 .. '!items!zealoussmite0000' @ 0 : 0; will stop at (end)
diff --git a/packs/talent/MANIFEST-001118 b/packs/talent/MANIFEST-001118
deleted file mode 100644
index eddf262f..00000000
Binary files a/packs/talent/MANIFEST-001118 and /dev/null differ
diff --git a/packs/talent/MANIFEST-001127 b/packs/talent/MANIFEST-001127
new file mode 100644
index 00000000..87e9b77e
Binary files /dev/null and b/packs/talent/MANIFEST-001127 differ
diff --git a/packs/taxonomy/000410.log b/packs/taxonomy/000418.log
similarity index 100%
rename from packs/taxonomy/000410.log
rename to packs/taxonomy/000418.log
diff --git a/packs/taxonomy/CURRENT b/packs/taxonomy/CURRENT
index 9040fb65..3de52090 100644
--- a/packs/taxonomy/CURRENT
+++ b/packs/taxonomy/CURRENT
@@ -1 +1 @@
-MANIFEST-000408
+MANIFEST-000416
diff --git a/packs/taxonomy/LOG b/packs/taxonomy/LOG
index bba0a190..b60be6b3 100644
--- a/packs/taxonomy/LOG
+++ b/packs/taxonomy/LOG
@@ -1,8 +1,8 @@
-2023/07/02-12:34:23.637 389a4 Recovering log #406
-2023/07/02-12:34:23.640 389a4 Delete type=0 #406
-2023/07/02-12:34:23.640 389a4 Delete type=3 #404
-2023/07/02-12:57:29.701 8700 Level-0 table #411: started
-2023/07/02-12:57:29.701 8700 Level-0 table #411: 0 bytes OK
-2023/07/02-12:57:29.702 8700 Delete type=0 #409
-2023/07/02-12:57:29.702 8700 Manual compaction at level-0 from '!folders!REYz7fzLYEdBX3A2' @ 72057594037927935 : 1 .. '!items!werewolf00000000' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.703 8700 Manual compaction at level-1 from '!folders!REYz7fzLYEdBX3A2' @ 72057594037927935 : 1 .. '!items!werewolf00000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.986 23cb8 Recovering log #414
+2023/07/02-17:19:45.989 23cb8 Delete type=0 #414
+2023/07/02-17:19:45.989 23cb8 Delete type=3 #412
+2023/07/02-17:20:21.605 8114 Level-0 table #419: started
+2023/07/02-17:20:21.605 8114 Level-0 table #419: 0 bytes OK
+2023/07/02-17:20:21.607 8114 Delete type=0 #417
+2023/07/02-17:20:21.611 8114 Manual compaction at level-0 from '!folders!REYz7fzLYEdBX3A2' @ 72057594037927935 : 1 .. '!items!werewolf00000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.611 8114 Manual compaction at level-1 from '!folders!REYz7fzLYEdBX3A2' @ 72057594037927935 : 1 .. '!items!werewolf00000000' @ 0 : 0; will stop at (end)
diff --git a/packs/taxonomy/LOG.old b/packs/taxonomy/LOG.old
index 4fc6da3c..a696420b 100644
--- a/packs/taxonomy/LOG.old
+++ b/packs/taxonomy/LOG.old
@@ -1,8 +1,8 @@
-2023/07/02-12:02:02.689 2fa48 Recovering log #402
-2023/07/02-12:02:02.692 2fa48 Delete type=0 #402
-2023/07/02-12:02:02.692 2fa48 Delete type=3 #400
-2023/07/02-12:34:02.693 8700 Level-0 table #407: started
-2023/07/02-12:34:02.693 8700 Level-0 table #407: 0 bytes OK
-2023/07/02-12:34:02.694 8700 Delete type=0 #405
-2023/07/02-12:34:02.697 8700 Manual compaction at level-0 from '!folders!REYz7fzLYEdBX3A2' @ 72057594037927935 : 1 .. '!items!werewolf00000000' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.697 8700 Manual compaction at level-1 from '!folders!REYz7fzLYEdBX3A2' @ 72057594037927935 : 1 .. '!items!werewolf00000000' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.066 2fe90 Recovering log #410
+2023/07/02-12:57:49.070 2fe90 Delete type=0 #410
+2023/07/02-12:57:49.070 2fe90 Delete type=3 #408
+2023/07/02-17:18:53.449 8700 Level-0 table #415: started
+2023/07/02-17:18:53.449 8700 Level-0 table #415: 0 bytes OK
+2023/07/02-17:18:53.450 8700 Delete type=0 #413
+2023/07/02-17:18:53.454 8700 Manual compaction at level-0 from '!folders!REYz7fzLYEdBX3A2' @ 72057594037927935 : 1 .. '!items!werewolf00000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.454 8700 Manual compaction at level-1 from '!folders!REYz7fzLYEdBX3A2' @ 72057594037927935 : 1 .. '!items!werewolf00000000' @ 0 : 0; will stop at (end)
diff --git a/packs/taxonomy/MANIFEST-000408 b/packs/taxonomy/MANIFEST-000416
similarity index 61%
rename from packs/taxonomy/MANIFEST-000408
rename to packs/taxonomy/MANIFEST-000416
index 0807c7b8..591b9034 100644
Binary files a/packs/taxonomy/MANIFEST-000408 and b/packs/taxonomy/MANIFEST-000416 differ
diff --git a/packs/weapon/001044.log b/packs/weapon/001052.log
similarity index 100%
rename from packs/weapon/001044.log
rename to packs/weapon/001052.log
diff --git a/packs/weapon/CURRENT b/packs/weapon/CURRENT
index 804eca4b..9bffde85 100644
--- a/packs/weapon/CURRENT
+++ b/packs/weapon/CURRENT
@@ -1 +1 @@
-MANIFEST-001042
+MANIFEST-001050
diff --git a/packs/weapon/LOG b/packs/weapon/LOG
index b93e8627..a07ff9bc 100644
--- a/packs/weapon/LOG
+++ b/packs/weapon/LOG
@@ -1,8 +1,8 @@
-2023/07/02-12:34:23.642 2fe90 Recovering log #1039
-2023/07/02-12:34:23.646 2fe90 Delete type=0 #1039
-2023/07/02-12:34:23.646 2fe90 Delete type=3 #1037
-2023/07/02-12:57:29.706 8700 Level-0 table #1045: started
-2023/07/02-12:57:29.706 8700 Level-0 table #1045: 0 bytes OK
-2023/07/02-12:57:29.706 8700 Delete type=0 #1043
-2023/07/02-12:57:29.708 8700 Manual compaction at level-0 from '!folders!9v0ru58f09fO3sE3' @ 72057594037927935 : 1 .. '!items!warlance00000000' @ 0 : 0; will stop at (end)
-2023/07/02-12:57:29.708 8700 Manual compaction at level-1 from '!folders!9v0ru58f09fO3sE3' @ 72057594037927935 : 1 .. '!items!warlance00000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:19:45.987 c658 Recovering log #1048
+2023/07/02-17:19:45.990 c658 Delete type=0 #1048
+2023/07/02-17:19:45.990 c658 Delete type=3 #1046
+2023/07/02-17:20:21.609 8114 Level-0 table #1053: started
+2023/07/02-17:20:21.609 8114 Level-0 table #1053: 0 bytes OK
+2023/07/02-17:20:21.610 8114 Delete type=0 #1051
+2023/07/02-17:20:21.611 8114 Manual compaction at level-0 from '!folders!9v0ru58f09fO3sE3' @ 72057594037927935 : 1 .. '!items!warlance00000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:20:21.611 8114 Manual compaction at level-1 from '!folders!9v0ru58f09fO3sE3' @ 72057594037927935 : 1 .. '!items!warlance00000000' @ 0 : 0; will stop at (end)
diff --git a/packs/weapon/LOG.old b/packs/weapon/LOG.old
index 066d84e6..6b909c5e 100644
--- a/packs/weapon/LOG.old
+++ b/packs/weapon/LOG.old
@@ -1,15 +1,8 @@
-2023/07/02-12:02:02.692 2fe90 Recovering log #1035
-2023/07/02-12:02:02.695 2fe90 Delete type=0 #1035
-2023/07/02-12:02:02.695 2fe90 Delete type=3 #1033
-2023/07/02-12:34:02.694 8700 Level-0 table #1040: started
-2023/07/02-12:34:02.695 8700 Level-0 table #1040: 1345 bytes OK
-2023/07/02-12:34:02.696 8700 Delete type=0 #1038
-2023/07/02-12:34:02.697 8700 Manual compaction at level-0 from '!folders!9v0ru58f09fO3sE3' @ 72057594037927935 : 1 .. '!items!warlance00000000' @ 0 : 0; will stop at (end)
-2023/07/02-12:34:02.697 8700 Manual compaction at level-1 from '!folders!9v0ru58f09fO3sE3' @ 72057594037927935 : 1 .. '!items!warlance00000000' @ 0 : 0; will stop at '!items!skullfetish00000' @ 1369 : 1
-2023/07/02-12:34:02.697 8700 Compacting 1@1 + 1@2 files
-2023/07/02-12:34:02.699 8700 Generated table #1041@1: 48 keys, 9966 bytes
-2023/07/02-12:34:02.699 8700 Compacted 1@1 + 1@2 files => 9966 bytes
-2023/07/02-12:34:02.700 8700 compacted to: files[ 0 0 1 0 0 0 0 ]
-2023/07/02-12:34:02.700 8700 Delete type=2 #1022
-2023/07/02-12:34:02.700 8700 Delete type=2 #1040
-2023/07/02-12:34:02.704 8700 Manual compaction at level-1 from '!items!skullfetish00000' @ 1369 : 1 .. '!items!warlance00000000' @ 0 : 0; will stop at (end)
+2023/07/02-12:57:49.070 2fa48 Recovering log #1044
+2023/07/02-12:57:49.073 2fa48 Delete type=0 #1044
+2023/07/02-12:57:49.073 2fa48 Delete type=3 #1042
+2023/07/02-17:18:53.452 8700 Level-0 table #1049: started
+2023/07/02-17:18:53.453 8700 Level-0 table #1049: 0 bytes OK
+2023/07/02-17:18:53.453 8700 Delete type=0 #1047
+2023/07/02-17:18:53.454 8700 Manual compaction at level-0 from '!folders!9v0ru58f09fO3sE3' @ 72057594037927935 : 1 .. '!items!warlance00000000' @ 0 : 0; will stop at (end)
+2023/07/02-17:18:53.457 8700 Manual compaction at level-1 from '!folders!9v0ru58f09fO3sE3' @ 72057594037927935 : 1 .. '!items!warlance00000000' @ 0 : 0; will stop at (end)
diff --git a/packs/weapon/MANIFEST-001042 b/packs/weapon/MANIFEST-001050
similarity index 61%
rename from packs/weapon/MANIFEST-001042
rename to packs/weapon/MANIFEST-001050
index a3b3b256..1fb91bd3 100644
Binary files a/packs/weapon/MANIFEST-001042 and b/packs/weapon/MANIFEST-001050 differ
diff --git a/system.json b/system.json
index 459a4958..c3e52e2f 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "id": "crucible",
   "title": "Crucible",
   "description": "Crucible is an innovative and modern tabletop role-playing game system built exclusively for Foundry Virtual Tabletop as a digital platform. From the ground up, Crucible is designed to leverage the unique capabilities of Foundry VTT to provide gamemasters with a powerful toolset and effortless layers of automation, allowing gamemasters and players to focus on what matters most: telling a compelling story.",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "url": "https://foundryvtt.com/packages/crucible",
   "authors": [
     {
@@ -123,5 +123,5 @@
   "primaryTokenAttribute": "resources.health",
   "secondaryTokenAttribute": "resources.morale",
   "manifest": "https://foundryvtt.s3.us-west-2.amazonaws.com/modules/crucible/system.json",
-  "protected": false
+  "protected": true
 }
diff --git a/templates/sheets/adversary.hbs b/templates/sheets/adversary.hbs
index 682ef3d5..717988a5 100644
--- a/templates/sheets/adversary.hbs
+++ b/templates/sheets/adversary.hbs
@@ -125,33 +125,34 @@
                 {{! Physical Defense --}}
                 <div class="physical-defenses defense flexrow" data-defense="physical">
                     <div class="physical-title flexrow">
-                        <h3 class="badge physical">Physical</h3>
-                        <span class="input score">{{actor.system.defenses.physical.total}}</span>
+                        <h3 class="badge physical">{{physicalDefenses.total.label}}</h3>
+                        <span class="input score">{{physicalDefenses.total.value}}</span>
+                        <span class="subtitle">{{physicalDefenses.total.subtitle}}</span>
                     </div>
                     <div class="physical-formula flexrow">
                         <span class="math">=</span>
                         <div class="flexcol">
-                            <h4>Armor</h4>
-                            <span class="input score">{{actor.system.defenses.armor.total}}</span>
-                            <span class="subtitle">{{armorCategory}}</span>
+                            <h4>{{physicalDefenses.armor.label}}</h4>
+                            <span class="input score">{{physicalDefenses.armor.value}}</span>
+                            <span class="subtitle">{{physicalDefenses.armor.pct}}%</span>
                         </div>
                         <span class="math">+</span>
                         <div class="flexcol">
-                            <h4>Dodge</h4>
-                            <span class="input score">{{actor.system.defenses.dodge.total}}</span>
-                            <span class="subtitle">Maximum {{systemData.defenses.dodge.max}}</span>
+                            <h4>{{physicalDefenses.dodge.label}}</h4>
+                            <span class="input score">{{physicalDefenses.dodge.value}}</span>
+                            <span class="subtitle">{{physicalDefenses.dodge.pct}}%</span>
                         </div>
                         <span class="math">+</span>
                         <div class="flexcol">
-                            <h4>Parry</h4>
-                            <span class="input score">{{actor.system.defenses.parry.total}}</span>
-                            <span class="subtitle">Maximum 6</span>
+                            <h4>{{physicalDefenses.parry.label}}</h4>
+                            <span class="input score">{{physicalDefenses.parry.value}}</span>
+                            <span class="subtitle">{{physicalDefenses.parry.pct}}%</span>
                         </div>
                         <span class="math">+</span>
                         <div class="flexcol">
-                            <h4>Block</h4>
-                            <span class="input score">{{actor.system.defenses.block.total}}</span>
-                            <span class="subtitle">Maximum 6</span>
+                            <h4>{{physicalDefenses.block.label}}</h4>
+                            <span class="input score">{{physicalDefenses.block.value}}</span>
+                            <span class="subtitle">{{physicalDefenses.block.pct}}%</span>
                         </div>
                     </div>
                 </div>