diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index c710359c8744ca53ade8bef27476b5826f3abacc..6acf59fbd89e6871f84ca36816aa6ae080e2230d 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -66,7 +66,7 @@
 <<set $tempSlave.vaginaLube = Number($tempSlave.vaginaLube) || 0>>
 <<set $tempSlave.pubertyAgeXX = Number($tempSlave.pubertyAgeXX) || 13>>
 <<set WombNormalizePreg($tempSlave)>>
-<<set $tempSlave.pregWeek = Number($tempSlave.pregWeek) || $tempSlave.preg>>
+<<set $tempSlave.pregWeek = Number($tempSlave.pregWeek) || Math.max($tempSlave.preg, 0)>>
 <<if $tempSlave.preg <= 0>>
 	<<set $tempSlave.pregKnown = 0>>
 <<elseif $tempSlave.preg > 0>>
@@ -113,7 +113,10 @@
 	<<set $tempSlave.indentureRestrictions = 2>>
 	<<print "Indenture Restrictions was bigger than 2 reset to Full Restrictions">><br>
 <</if>>
-<<if $tempSlave.weekAcquired < 0>><<set $tempSlave.weekAcquired = 0>><<print "Week Acquired was negativ reset to 0">><br><</if>>
+<<if $tempSlave.weekAcquired < 0>>
+	<<set $tempSlave.weekAcquired = 0>>
+	<<print "Week Acquired was negative reset to 0">><br>
+<</if>>
 <<if ($tempSlave.relationshipTarget == $tempSlave.ID) && ($tempSlave.relationship > 0)>>
 	<<set $tempSlave.relationshipTarget = 0>>
 	<<set $tempSlave.relationship = -1>>
@@ -167,10 +170,10 @@
 	<<set $tempSlave.lips = 100>>
 <</if>>
 <<if ($tempSlave.voice == 0) && ($tempSlave.voiceImplant == 1)>>
-	<<print "Slave is mute Voice Surgery resetted" >><br>
+	<<print "Slave is mute Voice Surgery reset" >><br>
 	<<set $tempSlave.voiceImplant = 0>>
 <</if>>
-<<if $tempSlave.amp <-5>>
+<<if $tempSlave.amp < -5>>
 	<<print "Amputation Value too low, reset to -5 (Cybernetic limbs)">><br>
 	<<set $tempSlave.amp = -5>>
 <<elseif $tempSlave.amp > 1>>
@@ -181,10 +184,22 @@
 	<<print "Slave has Normal Limbs, Limb Interface reset to 0 (No Interface)">><br>
 	<<set $tempSlave.PLimb = 0>>
 <</if>>
+<<if ($tempSlave.PLimb == 0) && ($tempSlave.amp < 0)>>
+	<<print "Slave has no Prosthetic limb Interface, limbs reset to 1 (Amputated)">>
+	<<set _tempLimbs = {type: 0, armsTat: 0, legsTat: 0}>>
+	<<set _tempLimbs.type = $tempSlave.amp, _tempLimbs.armsTat = $tempSlave.armsTat, _tempLimbs.legsTat = $tempSlave.legsTat>>
+	<<if !Array.isArray($tempSlave.readyLimbs)>>
+		<<set $tempSlave.readyLimbs = []>>
+	<</if>>
+	<<set $tempSlave.readyLimbs.push(_tempLimbs)>>
+	<<set $tempSlave.amp = 1>>
+<</if>>
 <<if ($tempSlave.amp != 0)>>
 	<<set $tempSlave.heightImplant = 0>>
-	<<set $tempSlave.legsTat = 0>>
-	<<set $tempSlave.armsTat = 0>>
+	<<if $tempSlave.amp == 1>>
+		<<set $tempSlave.legsTat = 0>>
+		<<set $tempSlave.armsTat = 0>>
+	<</if>>
 	<<set $tempSlave.nails = 0>>
 	<<set $tempSlave.heels = 0>>
 	<<if $tempSlave.brand != 0>>
@@ -207,10 +222,6 @@
 		<</if>>
 	<</if>>
 <</if>>
-<<if ($tempSlave.PLimb == 0) && ($tempSlave.amp != 0)>>
-	<<print "Slave has no Prostetic limb Interface, limbs reset to 1 (Amputated)">>
-	<<set $tempSlave.amp = 1>>
-<</if>>
 <<if $tempSlave.fuckdoll < 0>>
 	<<print "Fuckdoll Value too low, reset to 0 (Not a Fuckdoll)">><br>
 	<<set $tempSlave.fuckdoll = 0>>
@@ -308,8 +319,9 @@
 	<<set $tempSlave.preg = 0>>
 	<<set $tempSlave.pregType = 0>>
 	<<set $tempSlave.pregSource = 0>>
+	<<set $tempSlave.pregWeek = 0>>
 <</if>>
-<<if ($tempSlave.pubertyXX == 0) && ($tempSlave.physicalAge >= $tempSlave.pubertyAgeXX)>>
+<<if ($tempSlave.pubertyXX != 1) && ($tempSlave.physicalAge >= $tempSlave.pubertyAgeXX)>>
 	<<print "Slaves physical Age is equal or higher than female Puberty Age, Puberty set to 1 (Post Puberty)" >><br>
 	<<set $tempSlave.pubertyXX = 1>>
 <</if>>
@@ -322,6 +334,7 @@
 	<<set $tempSlave.preg = 0>>
 	<<set $tempSlave.pregType = 0>>
 	<<set $tempSlave.pregSource = 0>>
+	<<set $tempSlave.pregWeek = 0>>
 <</if>>
 <<if $tempSlave.balls < 0>>
 	<<print "Slave Balls Value set too low, reset to 0 (No Balls)">><br>
@@ -344,7 +357,7 @@
 <<elseif (ndef $tempSlave.pubertyXY) && ($tempSlave.physicalAge < $tempSlave.pubertyAgeXY)>>
 	<<set $tempSlave.pubertyXY = 0>>
 <</if>>
-<<if ($tempSlave.physicalAge >= $tempSlave.pubertyAgeXY) && ($tempSlave.pubertyXY == 0)>>
+<<if ($tempSlave.physicalAge >= $tempSlave.pubertyAgeXY) && ($tempSlave.pubertyXY != 1)>>
 	<<print "Slaves physical Age is equal or higher than male Puberty Age, Puberty set to 1 (Post Puberty)" >><br>
 	<<set $tempSlave.pubertyXY = 1>>
 <</if>>
@@ -402,7 +415,7 @@
 	<<set $tempSlave.energy = 0>>
 <<elseif $tempSlave.energy > 100>>
 	<<print "Sex Drive was set too high, reset to 100">><br>
-	<<set $tempSlave.energy =100>>
+	<<set $tempSlave.energy = 100>>
 <</if>>
 <<if $tempSlave.penetrativeCount < 0>>
 	<<print "Penetrative sex Count was set too low, reset to 0">><br>