diff --git a/code/game/gamemodes/changeling/powers/extract_dna_sting.dm b/code/game/gamemodes/changeling/powers/extract_dna_sting.dm
index 66bb36c499..3584f58f05 100644
--- a/code/game/gamemodes/changeling/powers/extract_dna_sting.dm
+++ b/code/game/gamemodes/changeling/powers/extract_dna_sting.dm
@@ -38,7 +38,7 @@
 	add_attack_logs(src,T,"DNA extraction sting (changeling)")
 
 	var/saved_dna = T.dna.Clone() /// Prevent transforming bugginess.
-	var/datum/absorbed_dna/newDNA = new(T.real_name, saved_dna, T.species.name, T.languages, T.identifying_gender, T.flavor_text, T.modifiers)
+	var/datum/absorbed_dna/newDNA = new(T.real_name, saved_dna, T.species.name, T.languages, T.identifying_gender, T.flavor_texts, T.modifiers)
 	absorbDNA(newDNA)
 
 	feedback_add_details("changeling_powers","ED")
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index f3ea2c65a1..fe93637465 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -26,9 +26,9 @@
 /*one proc, four uses
 swapping: if it's 1, the mobs are trying to switch, if 0, non-passive is pushing passive
 default behaviour is:
- - non-passive mob passes the passive version
- - passive mob checks to see if its mob_bump_flag is in the non-passive's mob_bump_flags
- - if si, the proc returns
+	- non-passive mob passes the passive version
+	- passive mob checks to see if its mob_bump_flag is in the non-passive's mob_bump_flags
+	- if si, the proc returns
 */
 /mob/living/proc/can_move_mob(var/mob/living/swapped, swapping = 0, passive = 0)
 	if(!swapped)
@@ -323,6 +323,9 @@ default behaviour is:
 	else if(!isspace(loc))
 		inertia_dir = 0
 		make_floating(0)
+	if(status_flags & HIDING)
+		layer = HIDING_LAYER
+		plane = OBJ_PLANE
 
 /mob/living/proc/inertial_drift()
 	if(x > 1 && x < (world.maxx) && y > 1 && y < (world.maxy))
@@ -330,16 +333,19 @@ default behaviour is:
 			inertia_dir = 0
 			return
 
-		var/locthen = loc
-		spawn(5)
-			if(!anchored && !pulledby && loc == locthen)
-				var/stepdir = inertia_dir ? inertia_dir : last_move
-				if(!stepdir)
-					return
-				var/turf/T = get_step(src, stepdir)
-				if(!T)
-					return
-				Move(T, stepdir, 5)
+		addtimer(CALLBACK(src, PROC_REF(handle_inertial_drift), loc), 0.5 SECONDS, TIMER_DELETE_ME)
+
+/mob/living/proc/handle_inertial_drift(var/locthen)
+	PRIVATE_PROC(TRUE)
+	SHOULD_NOT_OVERRIDE(TRUE)
+	if(!anchored && !pulledby && loc == locthen)
+		var/stepdir = inertia_dir ? inertia_dir : last_move
+		if(!stepdir)
+			return
+		var/turf/T = get_step(src, stepdir)
+		if(!T)
+			return
+		Move(T, stepdir, 5)
 
 /mob/living/proc/handle_footstep(turf/T)
 	return FALSE
diff --git a/code/modules/mob/living/living_powers.dm b/code/modules/mob/living/living_powers.dm
index f36e5b2b18..4735f0d9d5 100644
--- a/code/modules/mob/living/living_powers.dm
+++ b/code/modules/mob/living/living_powers.dm
@@ -54,11 +54,3 @@
 	else
 		touch_reaction_flags |= SPECIES_TRAIT_PERSONAL_BUBBLE
 		to_chat(src,span_notice("You will now dodge all attempts at hugging, patting, booping, licking, smelling and hand shaking."))
-
-//ChompEDIT START - re-assert our layer and plane
-/mob/living/Moved(var/atom/oldloc, direct, forced, movetime)
-	. = ..()
-	if(status_flags & HIDING)
-		layer = HIDING_LAYER
-		plane = OBJ_PLANE
-//ChompEDIT END
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index 2376f3de59..c454697018 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -1717,7 +1717,7 @@
 			if(T == src)
 				custom_emote_vr(1, "rubs their [belly_rub_target ? belly_rub_target : lowertext(B.name)].")
 			else
-				custom_emote_vr(1, "gives some rubs over [T]'s [belly_rub_target ? belly_rub_target : lowertext(B.name)].")
+				custom_emote_vr(1, "gives some rubs over [T]'s [T.belly_rub_target ? T.belly_rub_target : lowertext(B.name)].")
 			B.quick_cycle()
 			return TRUE
 	to_chat(src, span_vwarning("There is no suitable belly for rubs."))
diff --git a/tgui/packages/tgui/interfaces/GyrotronControl.tsx b/tgui/packages/tgui/interfaces/GyrotronControl.tsx
index 7a6c8bb990..2dc8b3c52a 100644
--- a/tgui/packages/tgui/interfaces/GyrotronControl.tsx
+++ b/tgui/packages/tgui/interfaces/GyrotronControl.tsx
@@ -32,6 +32,8 @@ export const GyrotronControlContent = (props) => {
 
   return (
     <Section
+      fill
+      scrollable
       title="Gyrotrons"
       buttons={
         <Button icon="pencil-alt" onClick={() => act('set_tag')}>