diff --git a/src/uncategorized/pBombing.tw b/src/uncategorized/pBombing.tw
index d52004a4f25b00c999880b832174484cd1e4dcff..7d7df0e2dd4d7119a6d2f31a5691b42c9462cb91 100644
--- a/src/uncategorized/pBombing.tw
+++ b/src/uncategorized/pBombing.tw
@@ -28,7 +28,7 @@ The implant is small, and went off too far ahead to do anything more than stun.
 <br><br>
 
 <<if $Bodyguard != 0>>
-	<<if $Bodyguard.amp <= -4>>
+	<<if getLimbCount($Bodyguard, 105) === 4>>
 		$Bodyguard.slaveName glances at you to check that $his principal is alive, $his P-Limbs already entering combat mode. $He becomes more inhuman by the moment,
 		<<if ($Bodyguard.muscles+$Bodyguard.height-100)/25 > 5>>
 			$his calves unfolding to reveal stabilizers that slide down and broaden $his ground contact. The targeting programs in $his arms allow $him to fire $his light machine gun from the hip, and $he places a precise burst in each target.
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 9b8230341b82e90a8b98017fa2018f4a0ccca27c..3e1ff8d5c1ea6538dda07f6bee4bd15cd9110f42 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1703,25 +1703,14 @@ Work on $him structurally:
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
 <</if>>
 
-/* PROSTHETICS */
-/* TODO Arkerthan
-I have a nice version, but it depends on the new limb system, so we have to do with this for now.
-*/
 <br>
-<<if !isAmputee($activeSlave)>>
-	Limbs: //This is a temporary solution while limb mechanics are being reworked.//<br>
-	Left arm: <<print idToDescription(getLeftArmID($activeSlave))>><br>
-	Right arm: <<print idToDescription(getRightArmID($activeSlave))>><br>
-	Left leg: <<print idToDescription(getLeftLegID($activeSlave))>><br>
-	Right leg: <<print idToDescription(getRightLegID($activeSlave))>>
-<<else>>
-	$He is a quadruple amputee
+/* PROSTHETICS */
+<<= App.Desc.limbs($activeSlave)>>
+<<if isAmputee($activeSlave)>>
 	<<if $activeSlave.PLimb == 1>>
-		and has been implanted with a basic PLimb interface.
+		$He has been implanted with a basic PLimb interface.
 	<<elseif $activeSlave.PLimb == 2>>
-		and has been implanted with an advanced PLimb interface.
-	<<else>>
-		and has not been equipped with prosthetics.
+		$He has been implanted with an advanced PLimb interface.
 	<</if>>
 <</if>>
 <br>
@@ -1729,9 +1718,9 @@ I have a nice version, but it depends on the new limb system, so we have to do w
 <<if hasAnyNaturalLimbs($activeSlave)>>
 	<<if $activeSlave.indentureRestrictions < 1 && $seeExtreme == 1>>
 		<<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP1"}) == -1 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceP2"}) == -1>>
-			[[Remove arms and legs|Surgery Degradation][surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "right arm"), surgeryAmp($activeSlave, "left leg"), surgeryAmp($activeSlave, "right leg"), $activeSlave.amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "amp"]] //This will greatly restrict $him//
+			[[Remove arms and legs|Surgery Degradation][surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "right arm"), surgeryAmp($activeSlave, "left leg"), surgeryAmp($activeSlave, "right leg"), $activeSlave.amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "amp"]] //This will greatly restrict $him//
 		<<else>>
-			[[Remove arms and legs|Surgery Degradation][surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "right arm"), surgeryAmp($activeSlave, "left leg"), surgeryAmp($activeSlave, "right leg"), $activeSlave.amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "amp1"]] //This will greatly restrict $him//
+			[[Remove arms and legs|Surgery Degradation][surgeryAmp($activeSlave, "left arm"), surgeryAmp($activeSlave, "right arm"), surgeryAmp($activeSlave, "left leg"), surgeryAmp($activeSlave, "right leg"), $activeSlave.amp = 1, $activeSlave.missingArms = 3, $activeSlave.missingLegs = 3, $activeSlave.releaseRules = "restrictive", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "amp1"]] //This will greatly restrict $him//
 		<</if>>
 	<</if>>
 <<elseif isAmputee($activeSlave) && $activeSlave.PLimb == 0>>