diff --git a/src/art/vector/VectorArtJS.js b/src/art/vector/VectorArtJS.js
index 2ffbc4002047ec8c59b788154d8f755f6e17dccd..22b19bccb7a787595964db76ad883cbadc4c9381 100644
--- a/src/art/vector/VectorArtJS.js
+++ b/src/art/vector/VectorArtJS.js
@@ -49,7 +49,7 @@ App.Art.vectorArtElement = (function() {
 		ArtVectorAnalAccessories();
 		ArtVectorButt();
 		ArtVectorLeg();
-		if (slave.amp !== 1) {
+		if (hasAnyLegs(slave)) {
 			ArtVectorFeet(); /* includes shoes and leg outfits*/
 		}
 		ArtVectorTorso();
@@ -186,10 +186,7 @@ App.Art.vectorArtElement = (function() {
 	}
 
 	function setArmType() {
-		if (slave.amp === 1) {
-			leftArmType = "None";
-			rightArmType = "None";
-		} else {
+		if (hasAnyArms(slave)) {
 			if (slave.devotion > 50) {
 				leftArmType = "High";
 				rightArmType = "High";
@@ -208,6 +205,14 @@ App.Art.vectorArtElement = (function() {
 				leftArmType = "Mid";
 				rightArmType = "Mid";
 			}
+			if (!hasLeftArm(slave)) {
+				leftArmType = "None";
+			} else if (!hasRightArm(slave)) {
+				rightArmType = "None";
+			}
+		} else {
+			leftArmType = "None";
+			rightArmType = "None";
 		}
 	}
 
@@ -671,13 +676,14 @@ App.Art.vectorArtElement = (function() {
 		/* - changed arm calculation block position*/
 		/* - added brackets to make boolean logic run */
 
-		if (slave.amp === 1) { /* Many amputee clothing art files exist, but draw nothing.They are excluded for now to reduce on rendering time
-			res.appendChild(useSvg("Art_Vector_Arm_Right_None"));
-			res.appendChild(useSvg("Art_Vector_Arm_Left_None"));
-			*/
-		} else { /* is not amputee or has limbs equipped so running arm calculation block */
-			if (slave.amp === 0) {
-				res.appendChild(useSvg(`Art_Vector_Arm_Right_${rightArmType}`));
+		/* Many amputee clothing art files exist, but draw nothing.They are excluded for now to reduce on rendering time. This is usually indicated by hasLeftArm(slave) checks and similar.
+		res.appendChild(useSvg("Art_Vector_Arm_Right_None"));
+		res.appendChild(useSvg("Art_Vector_Arm_Left_None"));
+		*/
+
+		/* left */
+		if (hasLeftArm(slave)) {
+			if (getLeftArmID(slave) === 1) {
 				res.appendChild(useSvg(`Art_Vector_Arm_Left_${leftArmType}`));
 				if (slave.muscles >= 6) {
 					if (leftArmType === "High") {
@@ -689,7 +695,26 @@ App.Art.vectorArtElement = (function() {
 					} else if (leftArmType === "Rebel") {
 						res.appendChild(useSvg("Art_Vector_Arm_Left_Rebel_MLight"));
 					}
+				}
+			}  else if (getLeftArmID(slave) === 2) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Left_ProstheticBasic_${rightArmType}`));
+			} else if (getLeftArmID(slave) === 3) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Left_ProstheticSexy_${rightArmType}`));
+			} else if (getLeftArmID(slave) === 4) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Left_ProstheticBeauty_${rightArmType}`));
+			} else if (getLeftArmID(slave) === 5) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Left_ProstheticCombat_${rightArmType}`));
+			} else if (getLeftArmID(slave) === 6) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Left_ProstheticSwiss_${rightArmType}`));
+			}
+		}
 
+
+		/* right */
+		if (hasRightArm(slave)) {
+			if (getRightArmID(slave) === 1) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Right_${rightArmType}`));
+				if (slave.muscles >= 6) {
 					if (rightArmType === "High") {
 						res.appendChild(useSvg("Art_Vector_Arm_Right_High_MLight"));
 					} else if (rightArmType === "Mid") {
@@ -698,104 +723,113 @@ App.Art.vectorArtElement = (function() {
 						res.appendChild(useSvg("Art_Vector_Arm_Right_Low_MLight"));
 					}
 				}
-			} else if (slave.PLimb === 1 || slave.PLimb === 2) { /* slave is an amputee and has PLimbs equipped */
-				if (slave.amp === -1) {
-					res.appendChild(useSvg(`Art_Vector_Arm_Right_ProstheticBasic_${rightArmType}`));
-					res.appendChild(useSvg(`Art_Vector_Arm_Left_ProstheticBasic_${leftArmType}`));
-				} else if (slave.amp === -2) {
-					res.appendChild(useSvg(`Art_Vector_Arm_Right_ProstheticSexy_${rightArmType}`));
-					res.appendChild(useSvg(`Art_Vector_Arm_Left_ProstheticSexy_${leftArmType}`));
-				} else if (slave.amp === -3) { /* Reverting beauty limbs to regular SVG */
-					res.appendChild(useSvg(`Art_Vector_Arm_Right_ProstheticBeauty_${rightArmType}`));
-					res.appendChild(useSvg(`Art_Vector_Arm_Left_ProstheticBeauty_${leftArmType}`));
-				} else if (slave.amp === -4) {
-					res.appendChild(useSvg(`Art_Vector_Arm_Right_ProstheticCombat_${rightArmType}`));
-					res.appendChild(useSvg(`Art_Vector_Arm_Left_ProstheticCombat_${leftArmType}`));
-				} else if (slave.amp === -5) {
-					res.appendChild(useSvg(`Art_Vector_Arm_Right_ProstheticSwiss_${rightArmType}`));
-					res.appendChild(useSvg(`Art_Vector_Arm_Left_ProstheticSwiss_${leftArmType}`));
-				}
+			} else if (getRightArmID(slave) === 2) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Right_ProstheticBasic_${rightArmType}`));
+			} else if (getRightArmID(slave) === 3) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Right_ProstheticSexy_${rightArmType}`));
+			} else if (getRightArmID(slave) === 4) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Right_ProstheticBeauty_${rightArmType}`));
+			} else if (getRightArmID(slave) === 5) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Right_ProstheticCombat_${rightArmType}`));
+			} else if (getRightArmID(slave) === 6) {
+				res.appendChild(useSvg(`Art_Vector_Arm_Right_ProstheticSwiss_${rightArmType}`));
 			}
-			/* shiny clothing */
-			if (V.seeVectorArtHighlights === 1) {
-				if (wearingLatex === true || slave.clothes === "body oil") {
-					/* only some arm positions have art (feel free to add more) */
-					if (leftArmType === "High") {
-						res.appendChild(useSvg("Art_Vector_Arm_Outfit_Shine_Left_High"));
-					} else if (leftArmType === "Mid") {
-						res.appendChild(useSvg("Art_Vector_Arm_Outfit_Shine_Left_Mid"));
-					} else if (leftArmType === "Low") {
-						res.appendChild(useSvg("Art_Vector_Arm_Outfit_Shine_Left_Low"));
-					}
+		}
+
+		/* shiny clothing */
+		if (V.seeVectorArtHighlights === 1) {
+			if (wearingLatex === true || slave.clothes === "body oil") {
+				/* only some arm positions have art (feel free to add more) */
+				if (leftArmType === "High") {
+					res.appendChild(useSvg("Art_Vector_Arm_Outfit_Shine_Left_High"));
+				} else if (leftArmType === "Mid") {
+					res.appendChild(useSvg("Art_Vector_Arm_Outfit_Shine_Left_Mid"));
+				} else if (leftArmType === "Low") {
+					res.appendChild(useSvg("Art_Vector_Arm_Outfit_Shine_Left_Low"));
 				}
 			}
-			/* TODO: simplify selection (select prefix, infix and suffix and combine instead of using switch statements) */
-			switch (slave.clothes) {
-				case "a biyelgee costume":
-				case "a burkini":
-				case "a button-up shirt":
-				case "a button-up shirt and panties":
-				case "a cheerleader outfit":
-				case "a dirndl":
-				case "a gothic lolita dress":
-				case "a hanbok":
-				case "a hijab and blouse":
-				case "a huipil":
-				case "a kimono":
-				case "a klan robe":
-				case "a long qipao":
-				case "a military uniform":
-				case "a mounty outfit":
-				case "a nice maid outfit":
-				case "a nice nurse outfit":
-				case "a police uniform":
-				case "a red army uniform":
-				case "a schoolgirl outfit":
-				case "a slutty klan robe":
-				case "a slutty nurse outfit":
-				case "a slutty qipao":
-				case "a sweater":
-				case "a sweater and cutoffs":
-				case "a sweater and panties":
-				case "a t-shirt":
-				case "a t-shirt and jeans":
-				case "a t-shirt and panties":
-				case "a t-shirt and thong":
-				case "an oversized t-shirt":
-				case "an oversized t-shirt and boyshorts":
-				case "battlearmor":
-				case "battledress":
-				case "clubslut netting":
-				case "conservative clothing":
-				case "cutoffs and a t-shirt":
-				case "lederhosen":
-				case "nice business attire":
-				case "slutty business attire":
-				case "slutty jewelry":
-				case "sport shorts and a t-shirt":
-				case "Western clothing":
+		}
+
+		/* TODO: simplify selection (select prefix, infix and suffix and combine instead of using switch statements) */
+		switch (slave.clothes) {
+			case "a biyelgee costume":
+			case "a burkini":
+			case "a button-up shirt":
+			case "a button-up shirt and panties":
+			case "a cheerleader outfit":
+			case "a dirndl":
+			case "a gothic lolita dress":
+			case "a hanbok":
+			case "a hijab and blouse":
+			case "a huipil":
+			case "a kimono":
+			case "a klan robe":
+			case "a long qipao":
+			case "a military uniform":
+			case "a mounty outfit":
+			case "a nice maid outfit":
+			case "a nice nurse outfit":
+			case "a police uniform":
+			case "a red army uniform":
+			case "a schoolgirl outfit":
+			case "a slutty klan robe":
+			case "a slutty nurse outfit":
+			case "a slutty qipao":
+			case "a sweater":
+			case "a sweater and cutoffs":
+			case "a sweater and panties":
+			case "a t-shirt":
+			case "a t-shirt and jeans":
+			case "a t-shirt and panties":
+			case "a t-shirt and thong":
+			case "an oversized t-shirt":
+			case "an oversized t-shirt and boyshorts":
+			case "battlearmor":
+			case "battledress":
+			case "clubslut netting":
+			case "conservative clothing":
+			case "cutoffs and a t-shirt":
+			case "lederhosen":
+			case "nice business attire":
+			case "slutty business attire":
+			case "slutty jewelry":
+			case "sport shorts and a t-shirt":
+			case "Western clothing":
+				if (hasRightArm(slave)) {
 					res.appendChild(useSvg(`Art_Vector_Arm_Outfit_${clothing2artSuffix(slave.clothes)}_Right_${rightArmType}`));
+				}
+				if (hasLeftArm(slave)) {
 					res.appendChild(useSvg(`Art_Vector_Arm_Outfit_${clothing2artSuffix(slave.clothes)}_Left_${leftArmType}`));
-					break;
-				/* manually handle special cases */
-				case "a schutzstaffel uniform":
-				case "a slutty schutzstaffel uniform":
+				}
+				break;
+			/* manually handle special cases */
+			case "a schutzstaffel uniform":
+			case "a slutty schutzstaffel uniform":
+				if (hasRightArm(slave)) {
 					res.appendChild(useSvg(`Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_${rightArmType}`));
+				}
+				if (hasLeftArm(slave)) {
 					res.appendChild(useSvg(`Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_${leftArmType}`));
-					break;
-				case "a hijab and abaya":
-				case "a niqab and abaya":
-				case "a burqa":
+				}
+				break;
+			case "a hijab and abaya":
+			case "a niqab and abaya":
+			case "a burqa":
+				if (hasRightArm(slave)) {
 					res.appendChild(useSvg(`Art_Vector_Arm_Outfit_HijabAndAbaya_Right_${rightArmType}`));
+				}
+				if (hasLeftArm(slave)) {
 					res.appendChild(useSvg(`Art_Vector_Arm_Outfit_HijabAndAbaya_Left_${leftArmType}`));
-					break;
-				case "a slave gown":
-					/* only some arm positions have art (feel free to add more) */
+				}
+				break;
+			case "a slave gown":
+				/* only some arm positions have art (feel free to add more) */
+				if (hasLeftArm(slave)) {
 					if (leftArmType !== "Rebel") {
 						res.appendChild(useSvg(`Art_Vector_Arm_Outfit_SlaveGown_Left_${leftArmType}`));
 					}
-			}
-		} /* close .amp check */
+				}
+		}
 	}
 
 	function ArtVectorBalls() {
@@ -1118,17 +1152,17 @@ App.Art.vectorArtElement = (function() {
 	}
 
 	function ArtVectorButt() {
-		if (slave.amp === 0) {
+		if (getLeftLegID(slave) === 1) {
 			res.appendChild(useSvg(`Art_Vector_Butt_${buttSize}`));
-		} else if (slave.amp === -1) {
+		} else if (getLeftLegID(slave) === 2) {
 			res.appendChild(useSvg(`Art_Vector_Butt_ProstheticBasic_${buttSize}`));
-		} else if (slave.amp === -2) {
+		} else if (getLeftLegID(slave) === 3) {
 			res.appendChild(useSvg(`Art_Vector_Butt_ProstheticSexy_${buttSize}`));
-		} else if (slave.amp === -3) { /* reverted to regular SVG to match description */
+		} else if (getLeftLegID(slave) === 4) { /* reverted to regular SVG to match description */
 			res.appendChild(useSvg(`Art_Vector_Butt_ProstheticBeauty_${buttSize}`));
-		} else if (slave.amp === -4) {
+		} else if (getLeftLegID(slave) === 5) {
 			res.appendChild(useSvg(`Art_Vector_Butt_ProstheticCombat_${buttSize}`));
-		} else if (slave.amp === -5) {
+		} else if (getLeftLegID(slave) === 6) {
 			res.appendChild(useSvg(`Art_Vector_Butt_ProstheticSwiss_${buttSize}`));
 		}
 	}
@@ -1729,23 +1763,25 @@ App.Art.vectorArtElement = (function() {
 		} else if (slave.shoes === "flats") {
 			res.appendChild(useSvg("Art_Vector_Shoes_Flat"));
 		} else {
-			if (slave.amp === 0) {
+			if (hasBothNaturalLegs(slave)) {
 				res.appendChild(useSvg("Art_Vector_Feet_Normal"));
-			} else if (slave.PLimb === 1 || slave.PLimb === 2) {
-				if (slave.amp === -1) {
-					res.appendChild(useSvg("Art_Vector_Feet_ProstheticBasic"));
-				} else if (slave.amp === -2) {
-					res.appendChild(useSvg("Art_Vector_Feet_ProstheticSexy"));
-				} else if (slave.amp === -3) {
-					res.appendChild(useSvg("Art_Vector_Feet_ProstheticBeauty"));
-				} else if (slave.amp === -4) {
-					res.appendChild(useSvg("Art_Vector_Feet_ProstheticCombat"));
-				} else if (slave.amp === -5) {
+			} else {
+				if (getLeftLegID(slave) === 6 || getRightLegID(slave) === 6) {
 					res.appendChild(useSvg("Art_Vector_Feet_ProstheticSwiss"));
+				} else if (getLeftLegID(slave) === 5 || getRightLegID(slave) === 5) {
+					res.appendChild(useSvg("Art_Vector_Feet_ProstheticCombat"));
+				} else if (getLeftLegID(slave) === 4 || getRightLegID(slave) === 4) {
+					res.appendChild(useSvg("Art_Vector_Feet_ProstheticBeauty"));
+				} else if (getLeftLegID(slave) === 3 || getRightLegID(slave) === 3) {
+					res.appendChild(useSvg("Art_Vector_Feet_ProstheticSexy"));
+				} else if (getLeftLegID(slave) === 2 || getRightLegID(slave) === 2) {
+					res.appendChild(useSvg("Art_Vector_Feet_ProstheticBasic"));
+				} else if (getLeftLegID(slave) === 1 || getRightLegID(slave) === 1) {
+					res.appendChild(useSvg("Art_Vector_Feet_Normal"));
 				}
 			}
 		}
-		if (stockings !== undefined && slave.amp !== 1) {
+		if (stockings !== undefined && hasAnyLegs(slave)) {
 			if (slave.shoes === "heels") {
 				res.appendChild(useSvg(`Art_Vector_Shoes_Heel_${stockings}_${legSize}`));
 			} else if (slave.shoes === "pumps") {
@@ -1815,7 +1851,7 @@ App.Art.vectorArtElement = (function() {
 				outfit = clothing2artSuffix(slave.clothes);
 		}
 		if (outfit !== undefined) {
-			if (slave.amp !== 1) {
+			if (hasAnyLegs(slave)) {
 				if (slave.clothes !== "a slutty qipao" && slave.clothes !== "harem gauze" && slave.clothes !== "slutty jewelry" && slave.clothes !== "Western clothing") { /* these clothes have a stump/leg outfit, but no butt outfit */
 					res.appendChild(useSvg(`Art_Vector_Butt_Outfit_${outfit}_${buttSize}`));
 				}
@@ -2502,7 +2538,7 @@ App.Art.vectorArtElement = (function() {
 
 	function ArtVectorLeg() {
 		/* Selection of matching SVG based on amputee level */
-		if (slave.amp === 0) {
+		if (hasBothNaturalLegs(slave)) {
 			res.appendChild(useSvg(`Art_Vector_Leg_${legSize}`));
 			if (slave.muscles >= 97) {
 				res.appendChild(useSvg(`Art_Vector_Leg_${legSize}_MHeavy`));
@@ -2511,19 +2547,29 @@ App.Art.vectorArtElement = (function() {
 			} else if (slave.muscles >= 30) {
 				res.appendChild(useSvg(`Art_Vector_Leg_${legSize}_MLight`));
 			}
-		} else if (slave.amp === 1) {
+		} else if (!hasAnyLegs(slave)) {
 			res.appendChild(useSvg("Art_Vector_Stump"));
-		} else if (slave.PLimb === 1 || slave.PLimb === 2) { /* slave is an amputee and has PLimbs equipped */
-			if (slave.amp === -1) {
-				res.appendChild(useSvg(`Art_Vector_Leg_ProstheticBasic_${legSize}`));
-			} else if (slave.amp === -2) {
-				res.appendChild(useSvg(`Art_Vector_Leg_ProstheticSexy_${legSize}`));
-			} else if (slave.amp === -3) {
-				res.appendChild(useSvg(`Art_Vector_Leg_ProstheticBeauty_${legSize}`));
-			} else if (slave.amp === -4) {
-				res.appendChild(useSvg(`Art_Vector_Leg_ProstheticCombat_${legSize}`));
-			} else { /* slave.amp === -5 */
+		} else {
+			/* show the best leg */
+			if (getLeftLegID(slave) === 6 || getRightLegID(slave) === 6) {
 				res.appendChild(useSvg(`Art_Vector_Leg_ProstheticSwiss_${legSize}`));
+			} else if (getLeftLegID(slave) === 5 || getRightLegID(slave) === 5) {
+				res.appendChild(useSvg(`Art_Vector_Leg_ProstheticCombat_${legSize}`));
+			} else if (getLeftLegID(slave) === 4 || getRightLegID(slave) === 4) {
+				res.appendChild(useSvg(`Art_Vector_Leg_ProstheticBeauty_${legSize}`));
+			} else if (getLeftLegID(slave) === 3 || getRightLegID(slave) === 3) {
+				res.appendChild(useSvg(`Art_Vector_Leg_ProstheticSexy_${legSize}`));
+			} else if (getLeftLegID(slave) === 2 || getRightLegID(slave) === 2) {
+				res.appendChild(useSvg(`Art_Vector_Leg_ProstheticBasic_${legSize}`));
+			} else {
+				res.appendChild(useSvg(`Art_Vector_Leg_${legSize}`));
+				if (slave.muscles >= 97) {
+					res.appendChild(useSvg(`Art_Vector_Leg_${legSize}_MHeavy`));
+				} else if (slave.muscles >= 62) {
+					res.appendChild(useSvg(`Art_Vector_Leg_${legSize}_MMedium`));
+				} else if (slave.muscles >= 30) {
+					res.appendChild(useSvg(`Art_Vector_Leg_${legSize}_MLight`));
+				}
 			}
 		}
 	}
@@ -2706,7 +2752,7 @@ App.Art.vectorArtElement = (function() {
 		}
 		if (V.seeVectorArtHighlights === 1) {
 			if (wearingLatex === true) {
-				if (slave.amp !== 0) {
+				if (hasLeftArm(slave)) {
 					res.appendChild(useSvg("Art_Vector_Torso_Outfit_Shine_Shoulder"));
 				}
 				if (slave.preg <= 0) {
@@ -2722,7 +2768,7 @@ App.Art.vectorArtElement = (function() {
 
 App.Art.legacyVectorArtElement = function() {
 	const filePath = "resources/vector";
-	const skinFilePath = `${filePath}/body/white`;
+	/* const skinFilePath = `${filePath}/body/white`; */
 
 	/**
 	 * @param {App.Entity.SlaveState} slave
@@ -2757,39 +2803,37 @@ App.Art.legacyVectorArtElement = function() {
 		underArmHStyle = slave.underArmHStyle;
 
 		/* Shoulder width and arm or no arm */
-		if (slave.amp !== 1) {
-			if (slave.devotion > 50) {
-				leftArmType = "high";
-				rightArmType = "high";
-			} else if (slave.trust >= -20) {
-				if (slave.devotion < -20) {
-					leftArmType = "rebel";
-					rightArmType = "low";
-				} else if (slave.devotion <= 20) {
-					leftArmType = "low";
-					rightArmType = "low";
-				} else {
-					leftArmType = "mid";
-					rightArmType = "high";
-				}
+		if (slave.devotion > 50) {
+			leftArmType = "High";
+			rightArmType = "High";
+		} else if (slave.trust >= -20) {
+			if (slave.devotion < -20) {
+				leftArmType = "Rebel";
+				rightArmType = "Low";
+			} else if (slave.devotion <= 20) {
+				leftArmType = "Low";
+				rightArmType = "Low";
 			} else {
-				leftArmType = "mid";
-				rightArmType = "mid";
+				leftArmType = "Mid";
+				rightArmType = "High";
 			}
+		} else {
+			leftArmType = "Mid";
+			rightArmType = "Mid";
+		}
 
-			if (wearingLatex === false) {
+		if (wearingLatex === false) {
+			if (!hasRightArm(slave)) {
 				addSkinImg(res, `arm right ${rightArmType}`, skinFilter);
-				if (slave.underArmHStyle === "bushy") {
-					addImg(res, `hair/underArm ${underArmHStyle} right`, underArmFilter);
-				}
-			} else {
-				if (slave.fuckdoll !== 0) {
-					rightArmType = "mid";
-				}
-				addImg(res, `outfit/arm right ${rightArmType} latex`);
 			}
-		} else if (wearingLatex === false && slave.underArmHStyle === "bushy") {
-			addImg(res, `hair/underArm ${underArmHStyle} right`, underArmFilter);
+			if (slave.underArmHStyle === "bushy") {
+				addImg(res, `hair/underArm ${underArmHStyle} right`, underArmFilter);
+			}
+		} else if (!hasRightArm(slave)) {
+			if (slave.fuckdoll !== 0) {
+				rightArmType = "mid";
+			}
+			addImg(res, `outfit/arm right ${rightArmType} latex`);
 		}
 
 		/* Hair Aft */
@@ -2811,7 +2855,7 @@ App.Art.legacyVectorArtElement = function() {
 		}
 
 		/* Butt */
-		if (slave.amp !== 1) {
+		if (hasAnyLegs(slave)) {
 			if (slave.butt > 6) {
 				buttSize = 3;
 			} else if (slave.butt > 4) {
@@ -2845,18 +2889,18 @@ App.Art.legacyVectorArtElement = function() {
 		} else {
 			legSize = "wide";
 		}
-		if (slave.amp === 1) {
+		if (!hasAnyLegs(slave)) {
 			legSize = `stump ${legSize}`;
 		}
 
-		if (wearingLatex === true && slave.amp !== 1) {
+		if (wearingLatex === true && hasAnyLegs(slave)) {
 			addImg(res, `outfit/leg ${legSize} latex`);
 		} else {
 			addSkinImg(res, `leg ${legSize}`, skinFilter);
 		}
 
 		/* Feet */
-		if (slave.amp !== 1) {
+		if (hasAnyLegs(slave)) {
 			if (slave.shoes === "heels") {
 				shoesType = "heel";
 			} else if (slave.shoes === "extreme heels") {
@@ -2910,28 +2954,21 @@ App.Art.legacyVectorArtElement = function() {
 			addImg(res, `outfit/torso ${torsoSize} straps`);
 		}
 
-		if (slave.amp !== 1) {
-			if (wearingLatex === false) {
-				if (leftArmType === "high") {
-					addSkinImg(res, `arm left ${leftArmType}`, skinFilter);
-					if (slave.underArmHStyle === "bushy") {
-						addImg(res, `hair/underArm ${underArmHStyle} left`, underArmFilter);
-					}
-				} else {
-					if (slave.underArmHStyle === "bushy") {
-						addImg(res, `hair/underArm ${underArmHStyle} left`, underArmFilter);
-					}
-					addSkinImg(res, `arm left ${leftArmType}`, skinFilter);
-				}
+		if (wearingLatex === false) {
+			if (hasLeftArm(slave) && leftArmType === "high") {
 				addSkinImg(res, `arm left ${leftArmType}`, skinFilter);
-			} else {
-				if (slave.fuckdoll !== 0) {
-					leftArmType = "mid";
-				}
-				addImg(res, `outfit/arm left ${leftArmType} latex`);
 			}
-		} else if (wearingLatex === false && slave.underArmHStyle === "bushy") {
-			addImg(res, `hair/underArm ${underArmHStyle} left`, underArmFilter);
+			if (slave.underArmHStyle === "bushy") {
+				addImg(res, `hair/underArm ${underArmHStyle} left`, underArmFilter);
+			}
+			if (hasLeftArm(slave) && leftArmType !== "high") {
+				addSkinImg(res, `arm left ${leftArmType}`, skinFilter);
+			}
+		} else if (hasLeftArm(slave)) {
+			if (slave.fuckdoll !== 0) {
+				leftArmType = "mid";
+			}
+			addImg(res, `outfit/arm left ${leftArmType} latex`);
 		}
 
 		/* Vagina */
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index bd18eac9d1bae8e95c571709e928c5cac712d217..b7db6eb66c239ab322862b5bd0fc311f33184872 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1696,7 +1696,7 @@ I have a nice version, but it depends on the new limb system, so we have to do w
 <<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>
+	Right arm: <<print idToDescription(getRightArmID($activeSlave))>><br>
 	Left leg: <<print idToDescription(getLeftLegID($activeSlave))>><br>
 	Right leg: <<print idToDescription(getRightLegID($activeSlave))>>
 <<else>>