diff --git a/game.js b/game.js
index 5396c38..f926be0 100644
--- a/game.js
+++ b/game.js
@@ -1274,6 +1274,9 @@ let macro =
     if (this.afterglow)
       return;
 
+    if (this.orgasm)
+      amount /= 5;
+    
     this.arousal += amount * this.arousalFactor;
 
     if (this.arousal >= 200) {
@@ -1293,7 +1296,6 @@ let macro =
         if (!this.maleParts && !this.femaleParts) {
           this.nullOrgasm(this);
         }
-        this.quench(100);
       }
     }
   },
@@ -1340,6 +1342,8 @@ let macro =
           self.femaleSpurt = 0;
         }
         update();
+      } else if (self.orgasm) {
+        self.quench(1);
       } else if (self.afterglow) {
         self.quench(0.5);
         self.edge = Math.max(0,self.edge - 0.01);
@@ -1348,20 +1352,15 @@ let macro =
     setTimeout(function() { self.quenchExcess(self); }, 200);
   },
 
-  "maleOrgasm": function(self) {
+  "maleOrgasm": function(self, times=0) {
     if (!this.arousalEnabled)
       return;
 
     if (self.orgasm) {
-      let amount = 0;
-      let times = Math.round(Math.random()*3+3);
-      for (let i=0; i<5; i++) {
-        let spurt = Math.min(this.cumVolume, this.cumStorage.amount);
-        amount += spurt;
-        this.cumStorage.amount -= spurt;
-      }
-      male_orgasm(amount, 5, false);
-      setTimeout(function() { self.maleOrgasm(self); }, 2000);
+      let spurt = Math.min(this.cumVolume, this.cumStorage.amount);
+      this.cumStorage.amount -= spurt;
+      male_orgasm(spurt, false);
+      setTimeout(function() { self.maleOrgasm(self); }, 5000);
     }
   },
 
@@ -1370,15 +1369,10 @@ let macro =
       return;
 
     if (this.orgasm) {
-      let amount = 0;
-      let times = Math.round(Math.random()*3+3);
-      for (let i=0; i<5; i++) {
-        let spurt = Math.min(this.femcumVolume, this.femcumStorage.amount);
-        amount += spurt;
-        this.femcumStorage.amount -= spurt;
-      }
-      female_orgasm(amount, 5, false);
-      setTimeout(function() { self.femaleOrgasm(self); }, 2000);
+      let spurt = Math.min(this.femcumVolume, this.femcumStorage.amount);
+      this.femcumStorage.amount -= spurt;
+      female_orgasm(spurt, false);
+      setTimeout(function() { self.femaleOrgasm(self); }, 5000);
     }
   },
 
@@ -2681,12 +2675,12 @@ function male_spurt_musk(area, active=true) {
   macro.arouse(5);
 }
 
-function male_orgasm(vol,times, active=true)
+function male_orgasm(vol, active=true)
 {
   let area = Math.pow(vol, 2/3);
 
   let prey = getPrey(biome, area);
-  let line = describe("male-orgasm", prey, macro, verbose).replace("$TIMES",times).replace("$VOLUME",volume(vol*times,unit,true));
+  let line = describe("male-orgasm", prey, macro, verbose).replace("$VOLUME",volume(vol,unit,true));
   let linesummary = summarize(prey.sum(), true);
 
   let people = get_living_prey(prey.sum());
@@ -2765,12 +2759,12 @@ function female_spurt_musk(area, active=true) {
   macro.arouse(5);
 }
 
-function female_orgasm(vol,times, active=true)
+function female_orgasm(vol, active=true)
 {
   let area = Math.pow(vol, 2/3);
 
   let prey = getPrey(biome, area);
-  let line = describe("female-orgasm", prey, macro, verbose).replace("$TIMES",times).replace("$VOLUME",volume(vol*times,unit,false));
+  let line = describe("female-orgasm", prey, macro, verbose).replace("$VOLUME",volume(vol,unit,false));
   let linesummary = summarize(prey.sum(), true);
 
   let people = get_living_prey(prey.sum());
diff --git a/recursive-desc.js b/recursive-desc.js
index 40d4c03..d2210d7 100644
--- a/recursive-desc.js
+++ b/recursive-desc.js
@@ -461,11 +461,11 @@ function defaultMaleSpurt(container, macro, verbose) {
 
 function defaultMaleOrgasm(container, macro, verbose) {
   if (container.count == 0)
-    return "Your " + macro.describeDick + " cock spurts $TIMES times, gushing out a $VOLUME glob of cum.";
+    return "Your " + macro.describeDick + " cock spurts, gushing out a $VOLUME glob of cum.";
   else if (isFatal(macro))
-    return "You're cumming! Your " + macro.describeDick + " cock erupts with $TIMES ropes of seed, obliterating " + container.describe(verbose) + " in a $VOLUME-torrent of cum.";
+    return "You're cumming! Your " + macro.describeDick + " cock erupts, obliterating " + container.describe(verbose) + " in a $VOLUME-torrent of cum.";
   else
-    return "You're cumming! Your " + macro.describeDick + " shaft erupts with $TIMES ropes of seed, splooging " + container.describe(verbose) + " in a $VOLUME-torrent of cum.";
+    return "You're cumming! Your " + macro.describeDick + " shaft spews a thick rope of seed, splooging " + container.describe(verbose) + " in a $VOLUME-torrent of cum.";
 }
 
 function defaultFemaleSpurt(container, macro, verbose) {
@@ -481,13 +481,13 @@ function defaultFemaleSpurt(container, macro, verbose) {
 
 function defaultFemaleOrgasm(container, macro, verbose) {
   if (container.count == 0)
-    return "Your moist slit sprays $TIMES times, gushing out $VOLUME of slick femcum.";
+    return "Your moist slit gushes $VOLUME of slick femcum.";
   else if (isSadistic(macro))
     return "Your quivering slit sprays $VOLUME of your intoxicating femcum, dissolving " + container.describe(verbose) + " in an unstoppable torrent of deadly lust.";
   else if (isFatal(macro))
-    return "Your moist slit sprays $VOLUME of slick femcum, obliterating " + container.describe(verbose) + " in $TIMES consecutive bursts of lust.";
+    return "Your moist slit sprays $VOLUME of slick femcum, obliterating " + container.describe(verbose) + " in a torrent of nectar.";
   else
-    return "Your moist slit sprays $VOLUME of slick femcum, splooging " + container.describe(verbose) + " with $TIMES orgasmic spurts.";
+    return "Your moist slit sprays $VOLUME of slick femcum, splooging " + container.describe(verbose) + " as you swoon with orgasmic lust.";
 }
 
 function defaultGrind(container, macro, verbose) {