diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 9ad7220cce578c8df283492b14382b3716c5b036..0ba7cdb8943a2b08b28844dcf64cae1a6f0e4e70 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -1039,6 +1039,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $nicaeaHeld = 0>>
<<set $peacekeepers = 0>>
<<set $peacekeepersFate = 0>>
+<<set $mercRomeo = 0>>
<<set $oralUseWeight = 5>>
<<set $vaginalUseWeight = 5>>
diff --git a/src/npc/removeActiveSlave.tw b/src/npc/removeActiveSlave.tw
index ad4466db4d48a726685f7c931252c0c0a16856d3..d34b57232b5e5599d42c11109d65e92e491d9bfe 100644
--- a/src/npc/removeActiveSlave.tw
+++ b/src/npc/removeActiveSlave.tw
@@ -1,4 +1,4 @@
-:: Remove activeSlave [nobr silently]
+:: Remove activeSlave [nobr]
<<set _ID = $activeSlave.ID, _SL = $slaves.length, _x = $slaveIndices[_ID]>>
@@ -78,6 +78,9 @@
<<if $slaves[_y].ID == $activeSlave.rivalryTarget>>
<<set $slaves[_y].rivalry = 0, $slaves[_y].rivalryTarget = 0>>
<</if>>
+ <<if $slaves[_y].origBodyOwnerID == _ID>>
+ <<set $slaves[_y].origBodyOwnerID = 0>>
+ <</if>>
<</for>>
/* remove from Pit fighters list, if needed */
@@ -119,6 +122,9 @@
<<set $traitor.father = $missingParentID>>
<<set _missingID = 1>>
<</if>>
+ <<if $traitor.origBodyOwnerID == _ID>>
+ <<set $traitor.origBodyOwnerID = 0>>
+ <</if>>
<</if>>
<<if $boomerangSlave != 0>>
<<if _ID == $boomerangSlave.pregSource>>
@@ -132,6 +138,9 @@
<<set $boomerangSlave.father = $missingParentID>>
<<set _missingID = 1>>
<</if>>
+ <<if $boomerangSlave.origBodyOwnerID == _ID>>
+ <<set $traitor.origBodyOwnerID = 0>>
+ <</if>>
<</if>>
<<set _o = $organs.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
diff --git a/src/pregmod/fSlaveSlaveVagConsummate.tw b/src/pregmod/fSlaveSlaveVagConsummate.tw
index 50ea6c6f8710b85ba7a7e9ade01ac17fd3d78eee..2d631559a12eecf6d1563a0965d360cbe708b74d 100644
--- a/src/pregmod/fSlaveSlaveVagConsummate.tw
+++ b/src/pregmod/fSlaveSlaveVagConsummate.tw
@@ -234,7 +234,15 @@ Next, you see to $activeSlave.slaveName.
You order $activeSlave.slaveName and $slaverapistx.slaveName to get on with it. They fuck mechanically at first, gazing with roiling emotions into each others' eyes. Eventually, they begin to enjoy the intimacy of the act, finding the shared pleasure between them comforting. They finish and resume life as slaves, the light of this intimacy diminishing, softening with $slaverapistx.slaveName's dick and dripping away with the contents of $activeSlave.slaveName's cum-filled pussy.
<<else>>
- The two slaves happily and eagerly get down to business. They take their time with foreplay, humping slowly and gazing into each others' eyes, exchanging kisses almost constantly. After a little while, $activeSlave.slaveName looks over $slaverapistx.slaveName's shoulder to where you're sitting, the invitation clear in $his eyes. You come over and penetrate $slaverapistx.slaveName with your <<if $PC.dick > 0>>dick<<else>>strap-on<</if>>. With the double stimulus of penetrating a tight vagina and being penetrated, $he comes indecently hard. The two of them collapse into an exhausted, happy pile of slave flesh.
+ The two slaves happily and eagerly get down to business. They take their time with foreplay, humping slowly and gazing into each others' eyes, exchanging kisses almost constantly. After a little while, $activeSlave.slaveName looks over $slaverapistx.slaveName's shoulder to where you're sitting, the invitation clear in $his eyes. As soon as you stand to come over, they roll over without being ordered to
+ <<if canDoAnal($activeSlave) && $activeSlave.anus > 0>>
+ present $activeSlave.slaveName's butthole.
+ <<set $activeSlave.analCount++, $analTotal++>>
+ <<else>>
+ invite you into $activeSlave.slaveName's crowded pussy.
+ <<set $activeSlave.vaginalCount++, $vaginalTotal++>>
+ <</if>>
+ You take up the offer and penetrate $activeSlave.slaveName with your <<if $PC.dick > 0>>dick<<else>>strap-on<</if>>. With the added stimulus of penetrating a tight hole alongside $his dear <<WrittenMaster $slaverapistx>>, $he comes indecently hard, but no where near as hard as the completely overloaded $activeSlave.slaveName. All of you collapse into an exhausted, happy pile of flesh.
<</if>>
diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw
index dbf9499c87b8a2632e4c8ed9c22e6ba66c061c66..0025b1b38c257064a82fd33bf749fe6c6ba104e0 100644
--- a/src/pregmod/widgets/bodySwapReaction.tw
+++ b/src/pregmod/widgets/bodySwapReaction.tw
@@ -1,4 +1,4 @@
-::Bodyswap Reaction [widget nobr]
+:: Bodyswap Reaction [widget nobr]
<<widget "BodySwapReaction">>
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 56da9f919ed32680c21c370b6604778f8c85b0f1..4c11b31c08fdcb015f1c68b46c540fb03c76d41a 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -11,6 +11,7 @@
<<set $args[0].origBodyOwner = $args[1].origBodyOwner>>
<</if>>
<</if>>
+
<<set WombInit($args[1])>> /*Just to be sure.*/
<<set $args[0].genes = $args[1].genes>>
<<set $args[0].prestige = $args[1].prestige>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 87d42c98af06c4f31630d69fd9f91ac1b789037b..282f4e6f761da5e3a4aa2146efbc3e0d7cf65ec8 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -5456,6 +5456,8 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
and challenges him to come over and fuck her.
<<case "masochist">>
and, applying a bit of reverse psychology, begins to beg him not to spank her helpless behind.
+ <<default>>
+ and implores him to fuck her.
<</switch>>
You detail another slave to fetch her after the public loses interest. A couple of hours later, you catch sight of her limping towards the showers, thoroughly disheveled. Her $activeSlave.skin face and chest are spattered with cum, she's got <<if $activeSlave.dick > 0>>her own ejaculate<<else>>pussyjuice<</if>> all over her thighs, and her well-fucked butthole is dripping semen. She's certainly worked hard @@.green;improving your reputation.@@
<<set $rep += 250>>
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 277f9974cc8029925f161abd5af1cdd8f3b0e868..42cd4ebc48ebc3423ea06bce4106d5902fd5d9b3 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1611,3 +1611,14 @@ The prosthesis facility has constructed $possessive prosthetic limbs.
<</if>>
<</if>>
<</if>>
+
+<<if $bodyswapAnnounced == 1 && $activeSlave.indenture < 0>>
+ <<if $activeSlave.bodySwap == 0>>
+ $pronounCap is in her native body.
+ <<elseif $activeSlave.origBodyOwner != "">>
+ $pronounCap currently occupies <<print $activeSlave.origBodyOwner>>'s body.
+ <<else>>
+ $pronounCap is no longer in her native body.
+ <</if>>
+ <br>[[Swap her body with another of your stock's|Slave Slave Swap Workaround]]
+<</if>>