diff --git a/lang/en.json b/lang/en.json
index 2dc13ecf..8e8f91ec 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -712,6 +712,11 @@
             }
         },
         "CONFIG": {
+            "ActionAutomationChoices": {
+                "never": "Never",
+                "showDialog": "Show Dialog Only",
+                "always": "Always"
+            },
             "AdversaryTrait": {
                 "relentless": {
                     "name": "Relentless",
diff --git a/module/applications/sheets-configs/setting-feature-config.mjs b/module/applications/sheets-configs/setting-feature-config.mjs
index 28e686ea..89421b65 100644
--- a/module/applications/sheets-configs/setting-feature-config.mjs
+++ b/module/applications/sheets-configs/setting-feature-config.mjs
@@ -188,8 +188,9 @@ export default class SettingFeatureConfig extends HandlebarsApplicationMixin(App
         if (type === 'effect') {
             const move = foundry.utils.getProperty(this.settings, this.movePath);
             for (const action of move.actions) {
-                const remainingEffects = action.effects.filter(x => x._id !== id);
-                if (action.effects.length !== remainingEffects.length) {
+                const actionEffects = action.effects ?? [];
+                const remainingEffects = actionEffects.filter(x => x._id !== id);
+                if (actionEffects.length !== remainingEffects.length) {
                     await action.update({
                         effects: remainingEffects.map(x => {
                             const { _id, ...rest } = x;
diff --git a/module/config/itemBrowserConfig.mjs b/module/config/itemBrowserConfig.mjs
index f20e56d0..638c1504 100644
--- a/module/config/itemBrowserConfig.mjs
+++ b/module/config/itemBrowserConfig.mjs
@@ -172,8 +172,8 @@ export const typeConfig = {
                 key: 'system.secondary',
                 label: 'DAGGERHEART.UI.ItemBrowser.subtype',
                 choices: [
-                    { value: false, label: 'DAGGERHEART.ITEMS.Weapon.primaryWeapon' },
-                    { value: true, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon' }
+                    { value: false, label: 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.short' },
+                    { value: true, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.short' }
                 ]
             },
             {
diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs
index 77328987..11330aee 100644
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@@ -453,7 +453,7 @@ export const allArmorFeatures = () => {
             const feature = homebrewFeatures[key];
             const actions = feature.actions.map(action => ({
                 ...action,
-                effects: action.effects.map(effect => feature.effects.find(x => x.id === effect._id)),
+                effects: action.effects?.map(effect => feature.effects.find(x => x.id === effect._id))??[],
                 type: action.type
             }));
             const actionEffects = actions.flatMap(a => a.effects);
@@ -1389,7 +1389,7 @@ export const allWeaponFeatures = () => {
 
             const actions = feature.actions.map(action => ({
                 ...action,
-                effects: action.effects.map(effect => feature.effects.find(x => x.id === effect._id)),
+                effects: action.effects?.map(effect => feature.effects.find(x => x.id === effect._id))??[],
                 type: action.type
             }));
             const actionEffects = actions.flatMap(a => a.effects);
diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs
index bb7fde0a..04d1db7a 100644
--- a/module/data/item/weapon.mjs
+++ b/module/data/item/weapon.mjs
@@ -28,7 +28,7 @@ export default class DHWeapon extends AttachableItem {
             equipped: new fields.BooleanField({ initial: false }),
 
             //SETTINGS
-            secondary: new fields.BooleanField({ initial: false, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon' }),
+            secondary: new fields.BooleanField({ initial: false, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full' }),
             burden: new fields.StringField({
                 required: true,
                 choices: CONFIG.DH.GENERAL.burden,
diff --git a/templates/characterCreation/footer.hbs b/templates/characterCreation/footer.hbs
index 51eef110..369af2d3 100644
--- a/templates/characterCreation/footer.hbs
+++ b/templates/characterCreation/footer.hbs
@@ -1,5 +1,5 @@
 <section class="creation-action-footer">
-    <button data-action="close">{{localize "COMMON.Cancel"}}</button>
+    <button data-action="close">{{localize "Cancel"}}</button>
     {{#if isLastTab}}
         <button data-action="finish">{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.finishCreation"}}</button>
     {{else}}
diff --git a/templates/dialogs/deathMove.hbs b/templates/dialogs/deathMove.hbs
index 97900022..341659df 100644
--- a/templates/dialogs/deathMove.hbs
+++ b/templates/dialogs/deathMove.hbs
@@ -17,7 +17,7 @@
     </div>
     <footer class="flexrow">
         <button data-action="close">
-            <span>{{localize "COMMON.Cancel"}}</span>
+            <span>{{localize "Cancel"}}</span>
         </button>
         <button data-action="takeMove" {{#if (not this.selectedMove)}}disabled{{/if}}>
             <span>
diff --git a/templates/dialogs/downtime/downtime.hbs b/templates/dialogs/downtime/downtime.hbs
index edaa81c1..9744ffea 100644
--- a/templates/dialogs/downtime/downtime.hbs
+++ b/templates/dialogs/downtime/downtime.hbs
@@ -28,7 +28,7 @@
     </fieldset>
 
     <footer>
-        <button type="button" data-action="close">{{localize "COMMON.Cancel"}}</button>
+        <button type="button" data-action="close">{{localize "Cancel"}}</button>
         <button type="button" data-action="takeDowntime" {{#if disabledDowntime}}disabled{{/if}}>{{localize "DAGGERHEART.APPLICATIONS.Downtime.takeDowntime"}}</button>
     </footer>
 </div>
\ No newline at end of file
diff --git a/templates/dialogs/image-select/footer.hbs b/templates/dialogs/image-select/footer.hbs
index 58a60cc4..cd7d3d1a 100644
--- a/templates/dialogs/image-select/footer.hbs
+++ b/templates/dialogs/image-select/footer.hbs
@@ -1,4 +1,4 @@
 <div class="footer">
-    <button data-action="close">{{localize "COMMON.Cancel"}}</button>
+    <button data-action="close">{{localize "Cancel"}}</button>
     <button type="button" data-action="finishSelection">{{localize "DAGGERHEART.APPLICATIONS.ImageSelect.selectImage"}}</button>
 </div>
\ No newline at end of file
diff --git a/templates/dialogs/multiclassChoice.hbs b/templates/dialogs/multiclassChoice.hbs
index 55365939..3c89ff1a 100644
--- a/templates/dialogs/multiclassChoice.hbs
+++ b/templates/dialogs/multiclassChoice.hbs
@@ -16,7 +16,7 @@
         </div>
 
         <footer>
-            <button data-action="close">{{localize "COMMON.Cancel"}}</button>
+            <button data-action="close">{{localize "Cancel"}}</button>
             <button data-action="save" {{disabled multiclassDisabled}}>{{localize "DAGGERHEART.GENERAL.multiclass"}}</button>
         </footer>
     </div>
diff --git a/templates/levelup/tabs/footer.hbs b/templates/levelup/tabs/footer.hbs
index d487e657..2ee7a316 100644
--- a/templates/levelup/tabs/footer.hbs
+++ b/templates/levelup/tabs/footer.hbs
@@ -20,7 +20,7 @@
     {{/if}}
     {{#unless levelupAuto}}
         <div class="levelup-footer">
-            <button type="button" data-action="close">{{localize "COMMON.Cancel"}}</button>
+            <button type="button" data-action="close">{{localize "Cancel"}}</button>
             <button type="button" data-action="save">{{localize "Save"}}</button>
         </div>
     {{/unless}}
diff --git a/templates/settings/downtime-config/footer.hbs b/templates/settings/downtime-config/footer.hbs
index 199aea15..5e5f31dd 100644
--- a/templates/settings/downtime-config/footer.hbs
+++ b/templates/settings/downtime-config/footer.hbs
@@ -1,4 +1,4 @@
 <section class='tab-form-footer spaced'>
-    <button data-action="close">{{localize "COMMON.Cancel"}}</button>
+    <button data-action="close">{{localize "Cancel"}}</button>
     <button data-action="saveForm"><i class="fa-solid fa-floppy-disk"></i> {{localize "Save"}}</button>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/items/weapon/settings.hbs b/templates/sheets/items/weapon/settings.hbs
index f9499221..7ff8becf 100644
--- a/templates/sheets/items/weapon/settings.hbs
+++ b/templates/sheets/items/weapon/settings.hbs
@@ -7,7 +7,7 @@
         <legend>{{localize tabs.settings.label}}</legend>
         <span>{{localize "DAGGERHEART.GENERAL.Tiers.singular"}}</span>
         {{formInput systemFields.tier value=source.system.tier}}
-        <span>{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}</span>
+        <span>{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full"}}</span>
         {{formInput systemFields.secondary value=source.system.secondary}}
         <span>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</span>
         {{formInput systemFields.attack.fields.roll.fields.trait value=document.system.attack.roll.trait name="system.attack.roll.trait" label="DAGGERHEART.GENERAL.Trait.single" localize=true}}
diff --git a/templates/ui/combatTracker/combatTrackerHeader.hbs b/templates/ui/combatTracker/combatTrackerHeader.hbs
index 8ac960c6..803286ab 100644
--- a/templates/ui/combatTracker/combatTrackerHeader.hbs
+++ b/templates/ui/combatTracker/combatTrackerHeader.hbs
@@ -66,7 +66,7 @@
 
         {{#if (and combats.length user.isGM)}}
             <div class="encounter-battlepoints" data-tooltip="#battlepoints#" data-combat-id="{{combat.id}}">
-                {{battlepoints.current}}/{{battlepoints.max}} BP{{#if battlepoints.hasModifierBP}}*{{/if}}
+                {{battlepoints.current}}/{{battlepoints.max}} {{localize "DAGGERHEART.GENERAL.Battlepoints.short"}}{{#if battlepoints.hasModifierBP}}*{{/if}}
             </div>
         {{/if}}