diff --git a/code/citadel/organs/breasts.dm b/code/citadel/organs/breasts.dm
index fcc506ccf0..901c546212 100644
--- a/code/citadel/organs/breasts.dm
+++ b/code/citadel/organs/breasts.dm
@@ -45,13 +45,11 @@
 		else
 			desc = "You see some breasts, they seem to be quite exotic."
 	if (size)
-		desc += " You estimate they're about [size]-cup size."
+		desc += " You estimate that they're [uppertext(size)]-cups."
 	else
 		desc += " You wouldn't measure them in cup sizes."
-	if(producing)
+	if(producing && aroused_state)
 		desc += " They're leaking [fluid_id]."
-	else
-		desc += " They do not seem to be producing liquids."
 	if(owner)
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
diff --git a/code/citadel/organs/penis.dm b/code/citadel/organs/penis.dm
index 404ace6a9c..509ed72ef4 100644
--- a/code/citadel/organs/penis.dm
+++ b/code/citadel/organs/penis.dm
@@ -17,7 +17,7 @@
 	var/girth_ratio 		= COCK_GIRTH_RATIO_DEF //0.73; check citadel_defines.dm
 	var/knot_girth_ratio 	= KNOT_GIRTH_RATIO_DEF
 	var/list/dickflags 		= list()
-	var/list/knotted_types 	= list("knotted", "barbknot")
+	var/list/knotted_types 	= list("knotted", "barbed, knotted")
 
 /obj/item/organ/genital/penis/update_size()
 	if(length == cached_length)
@@ -40,12 +40,7 @@
 	var/string = "penis_[GLOB.cock_shapes_icons[shape]]_[size]"
 	icon_state = sanitize_text(string)
 	var/lowershape = lowertext(shape)
-	if(lowershape in knotted_types)
-		if(lowershape == "barbknot")
-			lowershape = "barbed, knotted"
-		desc = "You see a [lowershape] penis. You estimate it's about [round(length, 0.25)] inch[length > 1 ? "es" : ""] long, [round(girth, 0.25)] inch[girth > 1 ? "es" : ""] around the shaft, and [round(length * knot_girth_ratio, 0.25)] inch[length > 1 ? "es" : ""] around the knot."
-	else
-		desc = "You see a [lowershape] penis. You estimate it's about [round(length, 0.25)] inch[length > 1 ? "es" : ""] long and [round(girth, 0.25)] inch[length > 1 ? "es" : ""] around."
+	desc = "You see a [lowershape] penis. You estimate it's about [round(length, 0.25)] inch[length > 1 ? "es" : ""] long."
 	if(owner)
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])
 			if(ishuman(owner)) // Check before recasting type, although someone fucked up if you're not human AND have use_skintones somehow...
diff --git a/code/citadel/organs/vagina.dm b/code/citadel/organs/vagina.dm
index e708b18a43..1f19dc7e64 100644
--- a/code/citadel/organs/vagina.dm
+++ b/code/citadel/organs/vagina.dm
@@ -28,23 +28,23 @@
 
 	switch(lowershape)
 		if("tentacle")
-			details = " Its opening is lined with several tentacles and "
+			details = "Its opening is lined with several tentacles and "
 		if("dentata")
-			details = " There's teeth inside it and it is "
+			details = "There's teeth inside it and it "
 		if("hairy")
-			details = " It has quite a bit of hair growing on it and is "
+			details = "It has quite a bit of hair growing on it and "
 		if("human")
-			details = " It is taut with smooth skin, though without much hair and "
+			details = "It is taut with smooth skin, though without much hair and "
 		if("gaping")
-			details = " It is gaping slightly open, though without much hair and "
+			details = "It is gaping slightly open, though without much hair and "
 		else
-			details = " It has an exotic shape and is "
+			details = "It has an exotic shape and "
 	if(aroused_state)
-		details += "slick with female arousal."
+		details += "is slick with female arousal."
 	else
-		details += "not very wet."
+		details += "seems to be dry."
 
-	desc = "You see a [lowershape] vagina. You estimate it to be around [round(cap_length, 0.5)] inch[cap_length > 1 ? "es" : ""] deep and could stretch around something [round(cap_girth, 0.5)] inch[cap_girth > 1 ? "es" : ""] in girth. It has [clits > 1 ? "[clits] clits" : "a clit"] about [round(clit_len,0.25)] inch[clit_len > 1 ? "es" : ""] long and [round(clit_diam, 0.25)] inch[clit_diam > 1 ? "es" : ""] in diameter.[details]"
+	desc = "You see a vagina. [details]"
 
 	if(owner)
 		if(owner.dna.species.use_skintones && owner.dna.features["genitals_use_skintone"])