diff --git a/src/endWeek/reports/clinicReport.js b/src/endWeek/reports/clinicReport.js
index 9366fb523ede2bf98ee03d5ea15d2e63ca9956b7..65dec26f6805a49a127d461c23cdbdbf1f95fc32 100644
--- a/src/endWeek/reports/clinicReport.js
+++ b/src/endWeek/reports/clinicReport.js
@@ -46,7 +46,7 @@ App.EndWeek.clinicReport = function() {
 					S.Nurse.fetishStrength += 4;
 				}
 			}
-			const {He, he, His, his, him, wife} = getPronouns(S.Nurse);
+			const {He, he, His, his, him, himself, wife} = getPronouns(S.Nurse);
 			r.push(`${SlaveFullName(S.Nurse)} is serving as the clinical nurse.`);
 			if (S.Nurse.relationship === -3 && S.Nurse.devotion > 50) {
 				r.push(`${He} does ${his} best to be a caring and nurturing ${wife}.`);
@@ -123,32 +123,43 @@ App.EndWeek.clinicReport = function() {
 						improveCondition(slave, 2);
 						break;
 					case "$He is remembered for winning best in show as a cockmilker.":
-						if ((slave.balls > 4) && (slave.dick !== 0)) {
+						if (slave.balls > 4 && slave.dick !== 0) {
 							r.push(`${He} does ${his} best to aid the dribbling ${slave.slaveName}, paying special attention to ${his2} huge cock and balls as well as making sure to milk ${his2}`);
 							if (canAchieveErection(slave)) {
 								r.push(`erect`);
 							}
 							r.push(`dick hourly.`);
 							improveCondition(slave, 4);
-							if (jsRandom(1, 100) > 65) {
+							if (jsRandom(1, 100) > 65 && canTaste(S.Nurse)) {
 								if (S.Nurse.fetish === "none") {
-									S.Nurse.fetish = "cumslut"; // FIXME: no player notification on fetish acquisition?
+									r.push(`It's not uncommon for ${him} to receive a load to the face; before long, <span class="fetish gain">${he} starts to enjoy the taste.</span>`);
+									S.Nurse.fetish = "cumslut";
 								} else if (S.Nurse.fetish === "cumslut") {
-									S.Nurse.fetishStrength += 4;
+									r.push(`${canSmell(S.Nurse) ? `The  smell of ${his2}` : `${His2}`} semen is irresistable to ${him} and sometimes ${he} can't help but`);
+									if (slave.chastityPenis === 0 && slave.rules.release.facilityLeader === 1) {
+										r.push(`wrap ${his} lips around ${him2} and sample the stuff directly,`);
+										seX(S.Nurse, "oral", slave, "penetrative");
+									} else {
+										r.push(`catch a little of it in a cup for further "analysis",`);
+									}
+									r.push(`<span class="fetish inc">further feeding ${his} cum fetishism.</span>`);
+									Math.clamp(S.Nurse.fetishStrength += 4, 0, 100);
 								}
 							}
 						}
 						break;
 					case "$He is remembered for winning best in show as a dairy cow.":
-						if ((slave.lactation > 0) && ((slave.boobs-slave.boobsImplant) > 6000)) {
+						if (slave.lactation > 0 && (slave.boobs - slave.boobsImplant - slave.boobsMilk) > 6000) {
 							r.push(`${He} does ${his} best to aid the leaking ${slave.slaveName}, paying special attention to ${his2} huge breasts as well as making sure to milk ${him2} hourly.`);
 							improveCondition(slave, 4);
 							slave.lactationDuration = 2;
-							if (jsRandom(1, 100) > 65) {
+							if (jsRandom(1, 100) > 65 && canTaste(S.Nurse)) {
 								if (S.Nurse.fetish === "none") {
-									S.Nurse.fetish = "boobs"; // FIXME: no player notification on fetish acquisition?
+									r.push(`Those lovely globes are just too tantilizing for ${him} to resist, <span class="fetish gain">${he} can't help but take a drink ${himself}.</span>`);
+									S.Nurse.fetish = "boobs";
 								} else if (S.Nurse.fetish === "boobs") {
-									S.Nurse.fetishStrength += 4;
+									r.push(`${He} takes the opportunity to <span class="fetish gain">feed ${his} breast fetishism</span> by getting up close and personal with ${his2} prized udders.`);
+									Math.clamp(S.Nurse.fetishStrength += 4, 0, 100);
 								}
 							}
 						}
@@ -172,7 +183,7 @@ App.EndWeek.clinicReport = function() {
 					if (slave.devotion > 50) {
 						slave.devotion += 4;
 						slave.trust += 3;
-					} else if ((slave.devotion >= -20)) {
+					} else if (slave.devotion >= -20) {
 						slave.trust -= 5;
 					} else {
 						slave.devotion -= 5;
diff --git a/src/endWeek/saLongTermEffects.js b/src/endWeek/saLongTermEffects.js
index 02643bb3432fcdaada267a12e3bd00c276ed8488..5994a4517e07ced2ed699c2a1b0f575efd65c5b2 100644
--- a/src/endWeek/saLongTermEffects.js
+++ b/src/endWeek/saLongTermEffects.js
@@ -2547,7 +2547,7 @@ App.SlaveAssignment.longTermEffects = (function() {
 				}
 			}
 			if (V.seeAge === 1) {
-				deathSeed = ((slave.health.health * 2) - (slave.physicalAge * 2) - (slave.chem * 4) - (slave.addict * 3));
+				deathSeed = ((slave.health.health * 2) - (slave.physicalAge * 2) - (slave.assignment === Job.CLINIC && S.Nurse && V.clinicUpgradeFilters >= 1 ? slave.chem : (slave.chem * 4)) - (slave.addict * 3));
 				if (slave.physicalAge >= Math.max((70 + (slave.health.health / 5) - (slave.addict) - (slave.chem / 20)), 50) && random(1, 1000) > 800 + deathSeed) {
 					planDeath(slave, "oldAge");
 				}