diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw
index 0a8d2f9cf61d42b6e21fabcc7c99e37b5094920c..7eb0a3a3f1dddc71327a1156a8d2cbc0b70d16c8 100644
--- a/src/gui/mainMenu/AlphaDisclaimer.tw
+++ b/src/gui/mainMenu/AlphaDisclaimer.tw
@@ -33,7 +33,7 @@
version: $ver, mod version: $pmodVer, build: $releaseID<<if App.Version.commitHash>>, commit: <<= App.Version.commitHash>><</if>>
</div>
<span style="font-weight:Bold"> /* remove me with 4.0.0! */
- 4.0.0 is in alpha release. This means the new player content has minimal implementation.
+ 4.0.0 is an alpha release. This means the new player content has minimal implementation.
</span>
<div id="version">
<<link "More version info">>
diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index ef889c54f42cbb71329940ded6f9536ff0703436..794150a11dc04651a76cf5bb1e561950dbd305d8 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -14,7 +14,7 @@
<<set $slaves[$i].rivalry = 0, $slaves[$i].rivalryTarget = 0>>
<</if>>
-<<if $slaves[$i].relationship > 0 && $slaves[$i].relationship < 4>>
+<<if $slaves[$i].relationship.isBetween(0, 4)>>
<<set _i = $slaveIndices[$slaves[$i].relationshipTarget]>>
<<if def _i>>
<<set $slaves[_i].relationship = 0, $slaves[_i].relationshipTarget = 0>>
diff --git a/src/npc/children/childInteract.tw b/src/npc/children/childInteract.tw
index f25a21e6add68088bca4e2df5e65f015a7f5c49c..f5ef0a39ce1adc32ae7d02b02c244c5a36c26d85 100644
--- a/src/npc/children/childInteract.tw
+++ b/src/npc/children/childInteract.tw
@@ -1499,7 +1499,7 @@ Routine sex with <<= properMaster()>> is ''<span id="relMaster"><<if $activeChil
<<set $activeChild.rules.speech = "permissive">>
<<replace "#speechRules">>$activeChild.rules.speech<</replace>>
<</link>>
- <<if $activeChild.accent > 0 && $activeChild.accent < 4>>| <<link "Accent elimination">>
+ <<if $activeChild.accent.isBetween(0, 4)>>| <<link "Accent elimination">>
<<set $activeChild.rules.speech = "accent elimination">>
<<replace "#speechRules">>$activeChild.rules.speech<</replace>>
<</link>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index e18fe462320607945e115d5d290beaca74d9dd8b..72acc6f0d867388802de9fa4af36a9fa844152a4 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1871,7 +1871,7 @@ At your <<if canSee($activeSlave)>>nod<<else>>acknowledgment<</if>>, $he
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
<<if $activeSlave.fetish == "dom">>
- <<if $activeSlave.dick > 0 && $activeSlave.dick < 5 && canPenetrate($activeSlave)>>
+ <<if $activeSlave.dick.isBetween(0, 5) && canPenetrate($activeSlave)>>
<<if canSee($activeSlave)>> /* not taking chances on the condition in there */
<<set _possibleDrugs.push({type: "dick", text: "peni<<s>> enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but when I do get to do a girl, <<Master>>, I want to <<s>>ee a little fear in her eye<<s>>."})>>
<<else>>
@@ -1891,14 +1891,14 @@ At your <<if canSee($activeSlave)>>nod<<else>>acknowledgment<</if>>, $he
<<set _possibleDrugs.push({type: "clit", text: "clit enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but I want to teach tho<<s>>e cocky <<s>>lut<<s>> a le<<ss>>on they'll never forget."})>>
<</if>>
<<elseif $activeSlave.fetish == "sadist">>
- <<if $activeSlave.dick > 0 && $activeSlave.dick < 5 && canPenetrate($activeSlave)>>
+ <<if $activeSlave.dick.isBetween(0, 5) && canPenetrate($activeSlave)>>
<<set _possibleDrugs.push({type: "dick", text: "peni<<s>> enhan<<c>>ement? I know I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, but when I do get to do a girl, <<Master>>, I want her to hurt."})>>
<</if>>
<<elseif $activeSlave.fetish == "masochist">>
<<if $activeSlave.dick > 1>>
<<set _possibleDrugs.push({type: "dickMinus", text: "hormone<<s>> to <<sh>>rink my dick? I'm a <<s>>e<<x>> <<s>>lave and it'<<s>> my pla<<c>>e to get fucked, and when I get u<<s>>ed like a little <<s>>lut it hurt<<s>> <<s>>o good, <<Master>>."})>>
<</if>>
- <<if $activeSlave.balls > 0 && $activeSlave.balls < 10 && $activeSlave.scrotum > 0>>
+ <<if $activeSlave.balls.isBetween(0, 10) && $activeSlave.scrotum > 0>>
<<set _possibleDrugs.push({type: "balls", text: "hormone<<s>> to <<s>>well up my ball<<s>>? I know I won't be u<<s>>ing them, but to have <<s>>uch a tempting target for abu<<s>>e, <<Master>>..."})>>
<</if>>
<<if $activeSlave.butt < 9>>
@@ -1924,7 +1924,7 @@ At your <<if canSee($activeSlave)>>nod<<else>>acknowledgment<</if>>, $he
<<if $activeSlave.lips <= 70>>
<<set _possibleDrugs.push({type: "lips", text: "lip enhan<<c>>ement? I want everyone to imagine my lip<<s>> around their cock, <<Master>>."})>>
<</if>>
- <<if $activeSlave.balls > 0 && $activeSlave.balls < 10 && $activeSlave.scrotum > 0>>
+ <<if $activeSlave.balls.isBetween(0, 10) && $activeSlave.scrotum > 0>>
<<set _possibleDrugs.push({type: "balls", text: "hormone<<s>> to add <<s>>ome weight to my ball<<s>>? I ju<<s>>t need to make more cum, <<Master>>. I promi<<s>>e I'll clean up after my<<s>>elf too!"})>>
<</if>>
<<elseif $activeSlave.fetish == "buttslut">>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 31a221bed6ed11e6f773e8564b866636fc0227ac..6dc80d21b01cee5383d011f29a409cd1e5752e81 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -113,7 +113,7 @@
<</if>>
<</for>>
- <<set _resMothers = _relatedSlaves.filter(function(s) { return s.daughters > 0 && s.devotion < 10 && s.anus != 0 && canWalk(s); })>>
+ <<set _resMothers = _relatedSlaves.filter(s => s.daughters > 0 && s.devotion < 10 && s.anus != 0 && canWalk(s))>>
<<for _resMothers.length > 0>>
<<set $motherSlave = _resMothers.pluck()>>
<<set $daughterSlave = randomDaughter($motherSlave)>>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index 8dddd60aaba42389c53965213984525a36777120..b55dd4211e425a7382e121241cd036f3ad7abcbd 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -16,7 +16,7 @@
<<set _slave.canRecruit = 0>>
<<if (_slave.dick > 0) && (_slave.balls == 0)>><<set _slave.balls = random(1,5)>><</if>>
-<<set _oppositeSex = $seeDicks > 0 && $seeDicks < 100 && (random(1, 4) <= 3)>>
+<<set _oppositeSex = $seeDicks.isBetween(0, 100) && (random(1, 4) <= 3)>>
<<set _secondSlave = generateRelatedSlave(_slave, "younger sibling", _oppositeSex)>>
<<set _secondSlave.relationship = 4>>