diff --git a/Changelog.txt b/Changelog.txt
index 659769541..97d91566e 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -2,13 +2,17 @@ Version 2.1.62
     OPs and players with the admin chat permission will now see details about XP rate event commands regardless of whether or not the XP rate event messages are enabled
     Updated hu_HU locale (thanks andris155)
     Added XP for mining Magma_Block (default 30 XP - Update your config, see notes)
+    Diamond tools & armor in the repair config now have a minimum level of 0 (Update your config, temporary hotfix, 2.2 addresses this issue, see notes)
+    Guardian default combat XP multiplier reduced from 3.0 to 1.0 (update config if you want this change)
     New locale string - 'XPRate.Modified' sent to the user who modifies the XP rate regardless of whether or not messages for the event are enabled
     New locale string - 'XPRate.End' sent to the user who ended the XP rate event regardless of whether or not messages for the event are enabled
     New locale string - 'XPRate.AdminDetails.End' details of who ended an XP rate event are sent to players who have Operator status or admin chat permission when the command to end the event has been issued
     New locale string - 'XPRate.AdminDetails.Start' details of who started an XP rate event are sent to players who have Operator status or admin chat permission when the command to start or modify XP of an event has been issued
     New locale string - 'Server.ConsoleName' the name of the server console, this will be used in place of player names when sending admin notifications out if the command was used from console
 
-    NOTES: Add an entry of 'Magma_Block: 30' under Mining in experience.yml (or you can delete the file to generate a new one with default values, 2.2 is coming soon which will have brand new configs so you could just wait for that
+    NOTES:
+    Add an entry of 'Magma_Block: 30' under Mining in experience.yml section titled "Experience_Values" (or you can delete the file to generate a new one with default values, 2.2 is coming soon which will have brand new configs so you could just wait for that
+    2.2 is the config rewrite, in this rewrite Repair and Salvage configs have been partially rewritten, it is not intended for Diamond Repair to take until level 50 in Standard level scaling to be available, since it'd be redundant to fix this in 2.1.X when 2.2 fixes it and its about to come out, the minimum level has temporarily been changed to 0. You can either update your repair.vanilla.yml config manually or delete it to generate a new one.
 
 Version 2.1.61
     Fixed the locale string formatting of 'Mining.SubSkill.DoubleDrops.Stat'
diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml
index 3bccdc004..8c7959fc9 100644
--- a/src/main/resources/experience.yml
+++ b/src/main/resources/experience.yml
@@ -461,7 +461,7 @@ Experience_Values:
             Iron_Golem: 2.0
             Wither_Skeleton: 4.0
             Endermite: 2.0
-            Guardian: 3.0
+            Guardian: 1.0
             Elder_Guardian: 4.0
             Shulker: 2.0
             Donkey: 1.0
diff --git a/src/main/resources/repair.vanilla.yml b/src/main/resources/repair.vanilla.yml
index f228633c8..50850eb7a 100644
--- a/src/main/resources/repair.vanilla.yml
+++ b/src/main/resources/repair.vanilla.yml
@@ -155,32 +155,32 @@ Repairables:
     ###
     # Tools
     DIAMOND_SWORD:
-        MinimumLevel: 50
+        MinimumLevel: 0
         XpMultiplier: .5
     DIAMOND_SHOVEL:
-        MinimumLevel: 50
+        MinimumLevel: 0
         XpMultiplier: .3
     DIAMOND_PICKAXE:
-        MinimumLevel: 50
+        MinimumLevel: 0
         XpMultiplier: 1
     DIAMOND_AXE:
-        MinimumLevel: 50
+        MinimumLevel: 0
         XpMultiplier: 1
     DIAMOND_HOE:
-        MinimumLevel: 50
+        MinimumLevel: 0
         XpMultiplier: .5
     # Armor
     DIAMOND_HELMET:
-        MinimumLevel: 50
+        MinimumLevel: 0
         XpMultiplier: 6
     DIAMOND_CHESTPLATE:
-        MinimumLevel: 50
+        MinimumLevel: 0
         XpMultiplier: 6
     DIAMOND_LEGGINGS:
-        MinimumLevel: 50
+        MinimumLevel: 0
         XpMultiplier: 6
     DIAMOND_BOOTS:
-        MinimumLevel: 50
+        MinimumLevel: 0
         XpMultiplier: 6
     #
     # Leather repairables