diff --git a/commands/player-stats.js b/commands/player-stats.js
index 54e2a80..9dfcc5a 100644
--- a/commands/player-stats.js
+++ b/commands/player-stats.js
@@ -231,7 +231,14 @@ module.exports = {
 
         let data = query.combatRatingHistory;
 
-        statsEmbed.addFields({ name: 'Combat Rating', value: `${query.combatRating}`, inline: true });
+        if (!client.exists(query.highestCombatRating)) query.highestCombatRating = query.combatRating;
+        if (!client.exists(query.lowestCombatRating)) query.lowestCombatRating = query.combatRating;
+
+        statsEmbed.addFields(
+          { name: 'Combat Rating', value: `${query.combatRating}`, inline: true },
+          { name: 'Highest Rating', value: `${query.highestCombatRating}`, inline: true },
+          { name: 'Lowest Rating', value: `${query.lowestCombatRating}`, inline: true },
+        );
 
         if (data.length == 1) data.push(query.combatRating) // Make array 2 long for a straight line in the graph
 
@@ -241,7 +248,7 @@ module.exports = {
             labels: new Array(data.length).fill(' ', 0, data.length),
             datasets: [{
               data: data,
-              label: 'Combat Rating Over Time',
+              label: `Last ${data.length} Combat Ratings`,
             }],
           },
           options: {
diff --git a/package.json b/package.json
index 2ca03e3..3080711 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dayzr-bot",
-  "version": "12.3.6",
+  "version": "12.3.7",
   "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.",
   "main": "index.js",
   "nodemonConfig": {
diff --git a/util/KillfeedHandler.js b/util/KillfeedHandler.js
index ec3f844..b2d4100 100644
--- a/util/KillfeedHandler.js
+++ b/util/KillfeedHandler.js
@@ -188,15 +188,15 @@ module.exports = {
     if (!client.exists(killerStat.combatRatingHistory)) killerStat.combatRatingHistory = [800];
     if (!client.exists(victimStat.combatRatingHistory)) victimStat.combatRatingHistory = [800];
     if (!client.exists(killerStat.highestCombatRating)) killerStat.highestCombatRating = killerStat.combatRating;
-    if (!client.exists(victimStat.lowestCombatRating)) victimStat.lowestCombatRating = victimStat.lowestCombatRating;
+    if (!client.exists(victimStat.lowestCombatRating)) victimStat.lowestCombatRating = victimStat.combatRating;
     let killerOldRating = killerStat.combatRating;
     let victimOldRating = victimStat.combatRating;
     killerStat.combatRating = calculateNewCombatRating(killerStat.combatRating, victimStat.combatRating, client.exists(info.bodyPart) && info.bodyPart.includes('Head') ? 1.25 : 1);
     victimStat.combatRating = calculateNewCombatRating(victimStat.combatRating, killerStat.combatRating, 0);
     if (killerStat.combatRating > killerStat.highestCombatRating) killerStat.highestCombatRating = killerStat.combatRating;
     if (victimStat.combatRating < victimStat.lowestCombatRating) killerStat.lowestCombatRating = victimStat.combatRating;
-    if (killerStat.combatRatingHistory.length == 20) killerStat.combatRatingHistory = killerStat.combatRatingHistory.slice(1); // Remove first element (limits history to length 20)
-    if (victimStat.combatRatingHistory.length == 20) victimStat.combatRatingHistory = victimStat.combatRatingHistory.slice(1); // Remove first element (limits history to length 20)
+    if (killerStat.combatRatingHistory.length == 15) killerStat.combatRatingHistory = killerStat.combatRatingHistory.slice(1); // Remove first element (limits history to length 15)
+    if (victimStat.combatRatingHistory.length == 15) victimStat.combatRatingHistory = victimStat.combatRatingHistory.slice(1); // Remove first element (limits history to length 15)
     killerStat.combatRatingHistory.push(killerStat.combatRating);
     victimStat.combatRatingHistory.push(victimStat.combatRating);
     let kdiff = killerStat.combatRating - killerOldRating;