diff --git a/public/sample_mystery.yaml b/public/sample_mystery.yaml
index ac2c17f..41728a9 100644
--- a/public/sample_mystery.yaml
+++ b/public/sample_mystery.yaml
@@ -140,7 +140,7 @@ compasses:
   dungeon: 60
   nearby: 10
   wild: 30
-show_loot:
+show_loot_map:
   never: 10
   presence: 30
   compass: 30
@@ -148,8 +148,9 @@ show_loot:
 show_loot_hud:
   never: 10
   presence: 30
-  value: 30
-  dungeon_value: 30
+  value: 20
+  dungeon_value: 20
+  cave_value: 20
 show_map:
   visited: 40
   map: 30
@@ -192,8 +193,9 @@ dark_rooms:
   starting_lamp: 0
   dark_in_logic: 0
 bombs:
-  normal: 70
+  normal: 50
   bomb_bag_required: 30
+  starting: 20
 book:
   normal: 70
   crystal_switches: 30
diff --git a/src/components/SettingsPage.vue b/src/components/SettingsPage.vue
index 5787831..89f9ce3 100644
--- a/src/components/SettingsPage.vue
+++ b/src/components/SettingsPage.vue
@@ -166,7 +166,7 @@ export default defineComponent({
       <SettingPicker color="primary" v-model="set.weapons" name="weapons" :generator="generator" :prefix="prefix" />
       <SettingPicker color="primary" v-model="set.hints" name="hints" :generator="generator" :prefix="prefix" />
       <SettingPicker color="primary" v-model="set.show_map" name="show_map" :generator="generator" :prefix="prefix" />
-      <SettingPicker color="primary" v-model="set.show_loot" name="show_loot" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.show_loot_map" name="show_loot_map" :generator="generator" :prefix="prefix" />
       <SettingPicker color="primary" v-model="set.show_loot_hud" name="show_loot_hud" :generator="generator" :prefix="prefix" />
     </AccordionItem>
     <AccordionItem :expanded="true">
@@ -242,7 +242,6 @@ export default defineComponent({
       </template>
       <SettingPicker color="success" v-model="set.boss_shuffle" name="boss_shuffle" :generator="generator" :prefix="prefix" />
       <SettingPicker color="success" v-model="set.enemy_shuffle" name="enemy_shuffle" :generator="generator" :prefix="prefix" />
-      <SettingPicker color="success" v-model="set.damage_table_shuffle" name="damage_table_shuffle" :generator="generator" :prefix="prefix" />
     </AccordionItem>
     <AccordionItem :expanded="false">
       <template #header>
@@ -279,6 +278,7 @@ export default defineComponent({
         <b>Challenge Modes:</b>
       </template>
       <SettingPicker color="danger" v-model="set.damage_challenge" name="damage_challenge" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="danger" v-model="set.damage_table_shuffle" name="damage_table_shuffle" :generator="generator" :prefix="prefix" />
     </AccordionItem>
   </div>
 </template>
diff --git a/src/data/generator-settings.yaml b/src/data/generator-settings.yaml
index 11aad6b..d491d4e 100644
--- a/src/data/generator-settings.yaml
+++ b/src/data/generator-settings.yaml
@@ -23,7 +23,7 @@ base:
   big_keys: all
   maps: all
   compasses: all
-  show_loot: all
+  show_loot_map: all
   show_map: all
   shop_shuffle: all
   drop_shuffle: all
@@ -86,7 +86,7 @@ beta:
   big_keys: all
   maps: all
   compasses: all
-  show_loot: all
+  show_loot_map: all
   show_loot_hud: all
   show_map: all
   shop_shuffle: all
@@ -133,7 +133,7 @@ pikit:
   big_keys: all
   maps: all
   compasses: all
-  show_loot: all
+  show_loot_map: all
   show_map: all
   shop_shuffle: all
   drop_shuffle: all
diff --git a/src/data/presets.yaml b/src/data/presets.yaml
index 6e77060..e0db618 100644
--- a/src/data/presets.yaml
+++ b/src/data/presets.yaml
@@ -33,7 +33,7 @@ base:
   criss_cross_boss:
     display: CrissCross Boss
     hints: on
-    show_loot: always
+    show_loot_map: always
     goal: boss_hunt
     bosses_ganon: 10of12
     ganon_item: random
@@ -58,7 +58,7 @@ base:
     book: crystal_switches
   bunday:
     display: Approximate Bunday
-    show_loot: never
+    show_loot_map: never
     show_map: visited
     goal: trinity
     crystals_ganon: random
@@ -87,8 +87,8 @@ beta:
   wjb_cross:
     display: wjbCross
     goal: fast_ganon
-    show_loot: always
     show_map: always
+    show_loot_map: always
     show_loot_hud: never
     entrance_shuffle: crossed
     skull_woods: vanilla_drops
@@ -101,4 +101,4 @@ beta:
 pikit:
   default:
     display: Default
-    show_loot: always
+    show_loot_map: always
diff --git a/src/data/settings.yaml b/src/data/settings.yaml
index 65f5848..bfa8622 100644
--- a/src/data/settings.yaml
+++ b/src/data/settings.yaml
@@ -532,10 +532,14 @@ bombs:
   default: normal
   values:
     normal:
-      display: No Bomb Bag Required
+      display: Normal
+      tip: The player does not start with any bombs, but can collect them as normal.
     bomb_bag_required:
       display: Bomb Bag Required
       tip: The player cannot collect any bombs until they obtain a bomb bag.
+    starting:
+      display: Start With 10 Bombs
+      tip: The player will start with a full 10 bombs.
 book:
   display: Book
   default: normal
@@ -589,10 +593,13 @@ door_type_mode:
   values:
     original:
       display: Key and Bomb Doors
+      tip: Only small key and bomb doors will be randomized.
     big:
       display: Key, Big Key, and Bomb Doors
+      tip: Big Key doors can also be added or removed.
     all:
-      display: All Door Types
+      display: Key, Big Key, Shutter, and Bomb Doors
+      tip: Shutter doors (preventing return in a direction) can be added.
     chaos:
       display: Chaos
 trap_door_mode:
@@ -702,8 +709,8 @@ damage_challenge:
     gloom:
       display: Gloom
       tip: Every enemy will deal one permanent heart container of damage. The only way to regain health is to find heart containers or collect four heart pieces.
-show_loot:
-  display: Show Dungeon Checks
+show_loot_map:
+  display: Show Dungeon Checks on Map
   default: presence
   values:
     never:
@@ -730,10 +737,13 @@ show_loot_hud:
       tip: A dot icon will show on the HUD on each underworld supertile with an uncollected item.
     value:
       display: Value
-      tip: An icon will show on the HUD on each underworld supertile, indicating the presence or value of the best uncollected item, as determined by the Show Dungeon Checks setting.
+      tip: An icon will show on the HUD on each underworld supertile, indicating the value of the best uncollected item.
     dungeon_value:
       display: Value in Dungeons, Presence in Caves
-      tip: An icon will show on the HUD on each underworld supertile, indicating the presence or value of the best uncollected item, as determined by the Show Dungeon Checks setting. Caves will only show presence, not value.
+      tip: An icon will show on the HUD on each dungeon supertile, indicating the value of the best uncollected item. Caves will show an indicator for presence, not value.
+    cave_value:
+      display: Value in Caves, Presence in Dungeons
+      tip: An icon will show on the HUD on each non-dungeon underworld supertile, indicating the value of the best uncollected item. Dungeons will show an indicator for presence, not value.
 show_map:
   display: Show Dungeon Maps
   default: map