diff --git a/maps/submaps/surface_submaps/valley/cliffmanor.dmm b/maps/submaps/surface_submaps/valley/cliffmanor.dmm
index 2363c6fed9..ba7cb53184 100644
--- a/maps/submaps/surface_submaps/valley/cliffmanor.dmm
+++ b/maps/submaps/surface_submaps/valley/cliffmanor.dmm
@@ -2,81 +2,81 @@
 "a" = (
 /mob/living/simple_mob/humanoid/cultist/tesh,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "b" = (
 /obj/machinery/firework_launcher,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "c" = (
 /obj/structure/table/wooden_reinforced,
 /obj/item/device/soulstone,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "d" = (
 /obj/structure/railing,
 /obj/structure/table/wooden_reinforced,
 /obj/random/medical/pillbottle,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "e" = (
 /obj/structure/railing{
 	dir = 1
 	},
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "f" = (
 /obj/structure/cliff/automatic{
 	dir = 8
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "g" = (
 /obj/structure/cliff/automatic{
 	dir = 9
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "h" = (
 /obj/structure/simple_door/wood,
 /turf/simulated/floor/wood/sif,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "i" = (
 /obj/structure/table/wooden_reinforced,
 /obj/item/weapon/flame/candle/everburn,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "j" = (
 /obj/structure/cliff/automatic{
 	dir = 10
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "k" = (
 /obj/structure/table/wooden_reinforced,
 /obj/random/energy/highend,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "l" = (
 /obj/structure/table/wooden_reinforced,
 /obj/random/gun/random,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "m" = (
 /obj/structure/table/wooden_reinforced,
 /obj/random/firstaid,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "n" = (
 /obj/structure/table/wooden_reinforced,
 /obj/item/clothing/head/psy_crown/wrath,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "p" = (
 /mob/living/simple_mob/vore/alienanimals/space_jellyfish{
 	faction = "cult"
 	},
 /turf/simulated/floor/water,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "q" = (
 /obj/structure/closet/crate,
 /obj/item/weapon/firework_star/weather/storm,
@@ -89,26 +89,26 @@
 /obj/item/weapon/firework_star/weather/blizzard,
 /obj/item/weapon/firework_star/weather/fallout,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "r" = (
 /obj/structure/railing,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "s" = (
 /turf/simulated/wall/log,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "t" = (
 /obj/structure/railing,
 /obj/structure/table/wooden_reinforced,
 /obj/random/firstaid,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "u" = (
 /turf/simulated/floor/water,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "v" = (
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "w" = (
 /turf/template_noop,
 /area/template_noop)
@@ -116,32 +116,32 @@
 /obj/structure/table/wooden_reinforced,
 /obj/random/projectile/random,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "y" = (
 /obj/structure/cliff/automatic{
 	dir = 4
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "B" = (
 /obj/structure/bed,
 /obj/item/weapon/bedsheet/blue,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "C" = (
 /mob/living/simple_mob/humanoid/cultist/noodle,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "D" = (
 /obj/structure/cliff/automatic/corner{
 	dir = 10
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "E" = (
 /obj/structure/cliff/automatic/corner,
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "F" = (
 /obj/structure/railing{
 	dir = 1
@@ -149,61 +149,61 @@
 /obj/structure/table/wooden_reinforced,
 /obj/random/medical/pillbottle,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "G" = (
 /obj/structure/cliff/automatic,
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "H" = (
 /obj/structure/closet/crate/secure/loot,
 /obj/random/mainttoyloot/nofail,
 /obj/random/mainttoyloot/nofail,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "I" = (
 /mob/living/simple_mob/humanoid/cultist/hunter,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "J" = (
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "M" = (
 /obj/structure/cliff/automatic{
 	dir = 6
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "N" = (
 /obj/structure/railing{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "O" = (
 /obj/structure/table/wooden_reinforced,
 /obj/item/clothing/head/psy_crown/gluttony,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "P" = (
 /obj/structure/railing{
 	dir = 8
 	},
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "Q" = (
 /obj/structure/cliff/automatic{
 	dir = 2
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "R" = (
 /mob/living/simple_mob/humanoid/cultist/castertesh,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "S" = (
 /obj/structure/table/wooden_reinforced,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "T" = (
 /obj/structure/railing{
 	dir = 1
@@ -211,19 +211,19 @@
 /obj/structure/table/wooden_reinforced,
 /obj/random/firstaid,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "U" = (
 /obj/structure/cliff/automatic/corner{
 	dir = 6
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "V" = (
 /obj/structure/cliff/automatic{
 	dir = 5
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "W" = (
 /obj/structure/railing{
 	dir = 1
@@ -231,23 +231,23 @@
 /obj/structure/table/wooden_reinforced,
 /obj/item/weapon/flame/candle/everburn,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "X" = (
 /mob/living/simple_mob/humanoid/cultist/human/bloodjaunt/fireball,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "Y" = (
 /obj/structure/cliff/automatic/corner{
 	dir = 9
 	},
 /turf/simulated/floor/outdoors/dirt,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 "Z" = (
 /obj/structure/railing,
 /obj/structure/table/wooden_reinforced,
 /obj/item/weapon/flame/candle/everburn,
 /turf/simulated/floor/wood,
-/area/submap/carriershuttle)
+/area/submap/cliffmanor)
 
 (1,1,1) = {"
 w
diff --git a/maps/submaps/surface_submaps/valley/eclipselava.dmm b/maps/submaps/surface_submaps/valley/eclipselava.dmm
index fef2818e3d..6195dbf608 100644
--- a/maps/submaps/surface_submaps/valley/eclipselava.dmm
+++ b/maps/submaps/surface_submaps/valley/eclipselava.dmm
@@ -89,6 +89,12 @@
 	},
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/eclipselava)
+"fi" = (
+/obj/structure/cliff/automatic/corner{
+	dir = 6
+	},
+/turf/simulated/floor/lava,
+/area/submap/eclipselava)
 "fG" = (
 /obj/structure/cable/green{
 	d1 = 2;
@@ -214,6 +220,12 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/submap/eclipselava)
+"mI" = (
+/obj/structure/cliff/automatic/corner{
+	dir = 10
+	},
+/turf/simulated/floor/lava,
+/area/submap/eclipselava)
 "mL" = (
 /obj/machinery/door/window/southright{
 	dir = 4
@@ -507,6 +519,12 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/submap/eclipselava)
+"Ad" = (
+/obj/structure/cliff/automatic{
+	dir = 2
+	},
+/turf/simulated/floor/lava,
+/area/submap/eclipselava)
 "Bm" = (
 /turf/template_noop,
 /area/template_noop)
@@ -1435,7 +1453,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 Rz
 gu
@@ -1487,7 +1505,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 WP
 bp
@@ -1539,7 +1557,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 dj
 MO
@@ -1591,7 +1609,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 dj
 Ez
@@ -1643,7 +1661,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 dj
 MO
@@ -1695,7 +1713,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 WP
 bp
@@ -1747,7 +1765,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 dj
 MO
@@ -1799,7 +1817,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 dj
 gt
@@ -1851,7 +1869,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 wU
 QN
@@ -1903,7 +1921,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 MO
 qb
@@ -1955,7 +1973,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 MO
 MO
@@ -2007,7 +2025,7 @@ Ke
 Ke
 Ke
 Ke
-eH
+mI
 bp
 bp
 bp
@@ -2839,7 +2857,7 @@ Ke
 Ke
 Ke
 Ke
-ZI
+fi
 bp
 bp
 bp
@@ -2891,7 +2909,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 ZK
 Pq
@@ -2943,7 +2961,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 En
 MO
@@ -2995,7 +3013,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 ph
 Pm
@@ -3047,7 +3065,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 En
 MO
@@ -3099,7 +3117,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 ZK
 Ej
@@ -3151,7 +3169,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 bp
 bp
@@ -3203,7 +3221,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 rs
 MO
@@ -3255,7 +3273,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 Gl
 rs
@@ -3307,7 +3325,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 MO
 rs
@@ -3359,7 +3377,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 MO
 MO
@@ -3411,7 +3429,7 @@ Ke
 Ke
 Ke
 Ke
-jU
+Ad
 bp
 rs
 MO
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm
index 2add800905..29d5ca2197 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm
@@ -539,7 +539,7 @@
 
 
 /mob/living/simple_mob/humanoid/eclipse/lunar/pummler
-	name = "Lunar Eclipse Punnler"
+	name = "Lunar Eclipse Pummeler"
 	projectiletype = /obj/item/projectile/bullet/shotgun/ion/eclipse
 	ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax
 	melee_damage_lower = 20