diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index d990e5eb757038e14b978b21bb41a23c3e82fbea..5cf781346e8b554abf691719b9bda2331bbeca00 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -224,7 +224,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
 	<<set $activeSlave.face = 15>>
 	<<set $activeSlave.anus to 0>>
 	<<set $activeSlave.vagina to 0>>
-	<<set $activeSlave.weight to random(20,100)>>
+	<<set $activeSlave.weight to random(20,140)>>
 	<<set $activeSlave.attrXX to random(60,90)>>
 	<<set $activeSlave.attrXY to random(10,50)>>
 	<<set $activeSlave.energy to random(60,80)>>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 03d70c2698fa3fa9702217b6afe8285fc5e204cf..ac31f902ab914ad07b47564a14c5e684e22c81e9 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -6,6 +6,8 @@
 
 <<SlaveTitle $eventSlave>>
 
+<<set $activeSlave = $eventSlave>> /* this should be harmless, keyword should */
+
 /* 000-250-006 */
 <<if $seeImages == 1>>
     <div class="imageRef medImg">
@@ -449,16 +451,16 @@ Being ordered into a relationship would be difficult for anyone, but they're so
 <<elseif ($subSlave.fetish == "boobs") && ($eventSlave.boobs > 4000)>>
 	$subSlave.slaveName fetishized breasts so much that she thinks $eventSlave.slaveName's udders are one of the sexiest things she's ever seen.
 	<<set _matched = 1>>
-<<elseif ($eventSlave.fetish == "pregnancy") && ($subSlave.fetish == "pregnancy") && $subSlave.preg > 20 && $subSlave.pregType > 10 && $eventSlave.preg > 20 && $eventSlave.pregType > 10>>
+<<elseif ($eventSlave.fetish == "pregnancy") && ($subSlave.fetish == "pregnancy") && hyperPregBellyOne($subSlave) && hyperPregBellyOne($eventSlave)>>
 	$eventSlave.slaveName and $subSlave.slaveName are both bursting with children, much to the each other's delight. They can't wait to explore each other's baby strained middle.
 	<<set _matched = 1>>
 <<elseif ($eventSlave.fetish == "pregnancy") && ($subSlave.fetish == "pregnancy") && $subSlave.preg > 20 && $eventSlave.preg > 20>>
 	$activeSlave.slaveName and $subSlave.slaveName are both heavily pregnant, much to the each other's delight.
 	<<set _matched = 1>>
-<<elseif ($subSlave.fetish == "pregnancy") && $eventSlave.preg > 20 && $eventSlave.pregType > 10>>
+<<elseif ($subSlave.fetish == "pregnancy") && hyperPregBellyOne($eventSlave)>>
 	$subSlave.slaveName fetishizes pregnant bellies so much that she is awestruck by $eventSlave.slaveName's bursting, baby filled middle.
 	<<set _matched = 1>>
-<<elseif ($eventSlave.fetish == "pregnancy") && $subSlave.preg > 20 && $subSlave.pregType > 10>>
+<<elseif ($eventSlave.fetish == "pregnancy") && hyperPregBellyOne($subSlave)>>
 	$eventSlave.slaveName fetishizes pregnant bellies so much that she is awestruck by $subSlave.slaveName's bursting, baby filled middle.
 	<<set _matched = 1>>
 <<elseif ($subSlave.fetish == "pregnancy") && $eventSlave.preg > 20>>