diff --git a/.gitignore b/.gitignore
index 25465c247765b92d4e5772b770f731b133d83b64..e4ad18d5203458562454f354ba43a78bcf0fc70a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,3 +106,4 @@ fc-pregmod
 *.todo
 TODO.txt
 .vscode/settings.json
+*.code-workspace
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 7d726edd0f40675190b162c58fa72365b658a31e..5aee891fca4dec70b24892b7da7cf4fcf215512f 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -202,10 +202,6 @@ It seems $he passed by while $subSlave.slaveName was beating the girl and found
 /* 000-250-006 */
 <<set $subSlave.clothes = _clothesTemp>> /*restore clothing to original values */
 
-<<switch $REFIevent>>
-
-<<case "masochist">>
-
 <<if $subSlave.belly >= 1500>>
 	You have $subSlave.slaveName lying down on your desk, and are seeing to your own amusement and _his2 masochistic streak at once. _He2 has _his2 body flat on the surface, but is unrestrained, and has been told that _he2 must not rise off it at all, nor tilt _his2 bulk to either side. You then tell _his2 to count strokes and begin to flog _his2 _subBelly belly with a leathern instrument<<if $subSlave.pregKnown == 1>>, taking care not to cause _his2 pregnancy any lasting harm<</if>>. Before long _he2 is experiencing more pain than the human body can support without involuntary movement, and you tell _him2 to go back one count whenever _he2 does. At long last _he2 completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until _he2 stiffens again at the
 	<<if canDoAnal($subSlave) && $subSlave.anus > 0>>
@@ -478,6 +474,8 @@ It seems $he passed by while you were drinking from $subSlave.slaveName and foun
 	<<st $subSlave.analCount++, $analTotal++>>
 <</if>>
 
+<<SetNonLocalPronouns $seeDicks>>
+
 /* 000-250-006 */
 <<if $seeImages == 1>>
 	<div class="imageRef medImg">
@@ -489,7 +487,7 @@ It seems $he passed by while you were drinking from $subSlave.slaveName and foun
 <</if>>
 /* 000-250-006 */
 
-$subSlave.slaveName is <<if $subSlave.vagina > 0 || $subSlave.anus > 0>>riding another slave, _his2 hands pinning her down<<else>>straddling another slave, _his2 <<if $subSlave.dick > 0>>cock in her mouth<<else>><<if $subSlave.vagina > 0>>pussy<<else>>ass<</if>>pressed to her face<</if>><</if>>. The <<if $seeDicks > 0 && ($subSlave.vagina > 0 || $subSlave.anus > 0)>>slaveboy<<else>>slavegirl<</if>> had been disobedient, and her punishment was to let $subSlave.slaveName dominate her. The truth is this is also _his2 reward; _he2 is such a dominant that _he2's prone to lashing out at your other slaves if _he2 isn't given a proper outlet. Sure enough, _his2 moans begin to increase in pitch and frequency, reaching a crescendo as _he2 comes to an orgasm. Once you feel the poor <<if $seeDicks > 0 && ($subSlave.vagina > 0 || $subSlave.anus > 0)>> beneath _him2 has had enough, you give $subSlave.slaveName the order to dismount. _He2 leaves your office with a smile on _his2 face, passing <<EventNameLink $activeSlave>>, who is
+$subSlave.slaveName is <<if $subSlave.vagina > 0 || $subSlave.anus > 0>>riding another slave, _his2 hands pinning _himU down<<else>>straddling another slave, _his2 <<if $subSlave.dick > 0>>cock in _hisU mouth<<else>><<if $subSlave.vagina > 0>>pussy<<else>>ass<</if>>pressed to _hisU face<</if>><</if>>. The slave_girlU had been disobedient, and _hisU punishment was to let $subSlave.slaveName dominate _himU. The truth is this is also _his2 reward; _he2 is such a dominant that _he2's prone to lashing out at your other slaves if _he2 isn't given a proper outlet. Sure enough, _his2 moans begin to increase in pitch and frequency, reaching a crescendo as _he2 comes to an orgasm. Once you feel the poor _girlU beneath _him2 has had enough, you give $subSlave.slaveName the order to dismount. _He2 leaves your office with a smile on _his2 face, passing <<EventNameLink $activeSlave>>, who is
 <<if $activeSlave.amp == 1>>
 	propped limblessly nearby. $He has
 <<elseif !canWalk($activeSlave)>>