diff --git a/_data/spell_data.yml b/_data/spell_data.yml
index a1e1678..778d42c 100644
--- a/_data/spell_data.yml
+++ b/_data/spell_data.yml
@@ -463,14 +463,14 @@
 - name: "Slow"
   school: "Evocation"
   icon: "/img/spells/slow.png"
-  level: "1 to 6"
-  mana: "50 to 100"
-  cooldown: "900s"
+  level: "1 to 4"
+  mana: "50 to 80"
+  cooldown: "1600s"
   cast_type: "Long"
-  rarity: "Uncommon to Legendary"
+  rarity: "Epic to Legendary"
   description: "In a radius around a targeted creature, apply the Slowed effect to enemies, decreasing movement speed, attack speed, mining speed, mana regeneration, and cast time for a duration."
-  u1: "10%-60% Slowed"
-  u2: "20s-40s Effect Length"
+  u1: "10%-40% Slowed"
+  u2: "20s-32s Effect Length"
   u3: "5 Max Targets"
   u4: ""
 
@@ -799,14 +799,14 @@
 - name: "Haste"
   school: "Holy"
   icon: "/img/spells/haste.png"
-  level: "1 to 6"
-  mana: "50 to 100"
-  cooldown: "900s"
+  level: "1 to 4"
+  mana: "50 to 80"
+  cooldown: "1600s"
   cast_type: "Long"
-  rarity: "Uncommon to Legendary"
+  rarity: "Epic to Legendary"
   description: "In a radius around a targeted creature, or yourself if no creature is targeted, apply the Hastened effect, increasing movement speed, attack speed, mining speed, mana regeneration, and cast time reduction for a duration."
-  u1: "10%-60% Hastened"
-  u2: "30s-55s Effect Length"
+  u1: "10%-40% Hastened"
+  u2: "30s-45s Effect Length"
   u3: "5 Max Targets"
   u4: ""
 
@@ -861,7 +861,7 @@
   cast_type: "Long"
   rarity: "Rare to Legendary"
   description: "Conjure a giant chunk of ice above a targeted creature or block. After a short delay, it will fall down and explode for area frost damage, doing additional damage to any creatures hit on the way down."
-  u1: "8-18 Damage"
+  u1: "14-24 Damage"
   u2: ""
   u3: ""
   u4: ""
@@ -903,7 +903,7 @@
   cast_type: "Instant"
   rarity: "Common to Legendary"
   description: "Fire a beam of cold energy, dealing low damage but immediately applying freeze to the creature hit."
-  u1: "9-15 Damage"
+  u1: "12-18 Damage"
   u2: "4.5s-7.5s Freeze Time"
   u3: "30 Block Range"
   u4: ""
@@ -944,7 +944,7 @@
   cooldown: "300s"
   cast_type: "Instant"
   rarity: "Rare to Legendary"
-  description: "Cast to strike lightning at your feet and ascend quickly into the air, and gain reduced gravity for the next few seconds."
+  description: "Cast to strike lightning at your feet and ascend quickly into the air, and gain reduced gravity for a short duration. The lightning bolt deals damage and knocks back creatures struck."
   u1: "5-14 Damage"
   u2: ""
   u3: ""
@@ -1266,7 +1266,7 @@
   cooldown: "500s"
   cast_type: "Long"
   rarity: "Legendary to Legendary"
-  description: "Blast forth a sonic boom of immense power, passing through solid material with ease and harming the first creature in its path."
+  description: "Blast forth a sonic boom of immense power, passing through solid material and harming all creatures in its path."
   u1: "20-36 Damage"
   u2: "20-30 Block Range"
   u3: ""
diff --git a/_data/spellbook_data.yml b/_data/spellbook_data.yml
index 39b08d0..60b0080 100644
--- a/_data/spellbook_data.yml
+++ b/_data/spellbook_data.yml
@@ -1,7 +1,7 @@
 - id: "irons_spellbooks:amethyst_rapier"
   name: "Amethyst Rapier"
   path: "/img/items/amethyst_rapier.png"
-  group: "Tools"
+  group: "Weapons"
   craftingType: "crafting"
   item0Id: ""
   item0: ""
@@ -30,13 +30,13 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "Can be Imbued (1/1), When in Main Hand:<br>  8 Attack Damage, 2.3 Attack Speed, 4 Attack Range, Imbued Spell:<br>  [Echoing Strikes 5], 98% Damage, 3 Block Radius, 48s Effect Length, 90 Mana Cost, 30s Cooldown"
+  tooltip: "Can be Imbued (1/1), When in Main Hand:<br>  8 Attack Damage, 2.3 Attack Speed, 3 Entity Interaction Range, 4 Attack Range, Imbued Spell:<br>  [Echoing Strikes 5], 90% Damage, 3 Block Radius, 40s Effect Length, 90 Mana Cost, 30s Cooldown"
   description: ""
 
 - id: "irons_spellbooks:artificer_cane"
   name: "Artificer's Cane"
   path: "/img/items/artificer_cane.png"
-  group: "Tools"
+  group: "Staves"
   craftingType: "crafting"
   item0Id: ""
   item0: ""
@@ -65,13 +65,13 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "When in Either Hand:<br>  4 Attack Damage, 1 Attack Speed, 2.5 Attack Range, +15% Cast Time Reduction, +15% Cooldown Reduction, +10% Spell Power"
+  tooltip: "When in Main Hand:<br>  4 Attack Damage, 1 Attack Speed, 3 Entity Interaction Range, 2.5 Attack Range, +15% Cast Time Reduction, +15% Cooldown Reduction, +10% Spell Power"
   description: ""
 
 - id: "irons_spellbooks:autoloader_crossbow"
   name: "Autoloader Crossbow"
   path: "/img/items/autoloader_crossbow.png"
-  group: ""
+  group: "Weapons"
   craftingType: "none"
   item0Id: ""
   item0: ""
@@ -106,7 +106,7 @@
 - id: "irons_spellbooks:blaze_spell_book"
   name: "Blaze Instruction Manual"
   path: "/img/items/blaze_spell_book.png"
-  group: ""
+  group: "Spellbooks"
   craftingType: "none"
   item0Id: ""
   item0: ""
@@ -141,7 +141,7 @@
 - id: "irons_spellbooks:blood_staff"
   name: "The Blood Staff"
   path: "/img/items/blood_staff.png"
-  group: ""
+  group: "Staves"
   craftingType: "none"
   item0Id: ""
   item0: ""
@@ -170,7 +170,7 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "When in Either Hand:<br>  8 Attack Damage, 1 Attack Speed, 2.5 Attack Range, +15% Blood Spell Power, +10% Summon Damage, +5% Spell Power"
+  tooltip: "When in Main Hand:<br>  8 Attack Damage, 1 Attack Speed, 3 Entity Interaction Range, 2.5 Attack Range, +15% Blood Spell Power, +5% Spell Power, +10% Summon Damage"
   description: ""
 
 - id: "irons_spellbooks:copper_spell_book"
@@ -316,7 +316,7 @@
 - id: "irons_spellbooks:evoker_spell_book"
   name: "Grimoire of Evokation"
   path: "/img/items/evoker_spell_book.png"
-  group: ""
+  group: "Spellbooks"
   craftingType: "none"
   item0Id: ""
   item0: ""
@@ -345,7 +345,7 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "Fang Strike (6), Fang Ward (4), Summon Vex (4)"
+  tooltip: "Unique Spell Book, Press [V] to cast, Inscribed Spells:<br>  [Fang Strike 6], [Fang Ward 4], [Summon Vex 4], When equipped as Spell Book:<br> +10% Evocation Spell Power, +200 Max Mana"
   description: ""
 
 - id: "irons_spellbooks:gold_spell_book"
@@ -386,7 +386,7 @@
 - id: "irons_spellbooks:graybeard_staff"
   name: "Graybeard Staff"
   path: "/img/items/graybeard_staff.png"
-  group: "Tools"
+  group: "Staves"
   craftingType: "crafting"
   item0Id: ""
   item0: ""
@@ -415,13 +415,13 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "When in Either Hand:<br>  3 Attack Damage, 1 Attack Speed, 2.5 Attack Range, +25% Mana Regeneration, +10% Spell Power"
+  tooltip: "When in Main Hand:<br>  3 Attack Damage, 1 Attack Speed, 3 Entity Interaction Range, 2.5 Attack Range, +25% Mana Regeneration, +10% Spell Power"
   description: ""
 
 - id: "irons_spellbooks:hither_thither_wand"
   name: "Hither-Thither Wand"
   path: "/img/items/hither_thither_wand.png"
-  group: ""
+  group: "Weapons"
   craftingType: "none"
   item0Id: ""
   item0: ""
@@ -450,13 +450,13 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "Unique, Imbued Spell:<br>  [Portal 1], 48 Cast Range, 6m Portal Duration, 200 Mana Cost, 1.5m Cooldown"
+  tooltip: "Unique, Imbued Spell:<br>  [Portal 1], 48 Cast Range, 5m Portal Duration, 200 Mana Cost, 1.5m Cooldown"
   description: ""
 
 - id: "irons_spellbooks:ice_staff"
   name: "Ice Staff"
   path: "/img/items/ice_staff.png"
-  group: "Tools"
+  group: "Staves"
   craftingType: "crafting"
   item0Id: "irons_spellbooks:frosted_helve"
   item0: "Frosted Helve"
@@ -485,7 +485,7 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "When in Either Hand:<br>  5 Attack Damage, 1 Attack Speed, 2.5 Attack Range, +25% Mana Regeneration, +15% Ice Spell Power, +5% Spell Power"
+  tooltip: "When in Main Hand:<br>  5 Attack Damage, 1 Attack Speed, 3 Entity Interaction Range, 2.5 Attack Range, +15% Ice Spell Power, +25% Mana Regeneration, +5% Spell Power"
   description: ""
 
 - id: "irons_spellbooks:iron_spell_book"
@@ -526,7 +526,7 @@
 - id: "irons_spellbooks:keeper_flamberge"
   name: "Decrepit Flamberge"
   path: "/img/items/keeper_flamberge.png"
-  group: ""
+  group: "Weapons"
   craftingType: "none"
   item0Id: ""
   item0: ""
@@ -555,13 +555,13 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "Two-Handed, When in Main Hand:<br>  11 Attack Damage, 1.3 Attack Speed, 2.75 Attack Range, +4 Armor"
+  tooltip: "Two-Handed, When in Main Hand:<br>  11 Attack Damage, 1.3 Attack Speed, 3 Entity Interaction Range, 2.75 Attack Range, +4 Armor"
   description: ""
 
 - id: "irons_spellbooks:lightning_rod"
   name: "Rod o' Lightning"
   path: "/img/items/lightning_rod.png"
-  group: ""
+  group: "Staves"
   craftingType: "none"
   item0Id: ""
   item0: ""
@@ -590,13 +590,13 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "When in Either Hand:<br>  5 Attack Damage, 1 Attack Speed, 2.5 Attack Range, +15% Cooldown Reduction, +15% Lightning Spell Power, +5% Spell Power"
+  tooltip: "When in Main Hand:<br>  5 Attack Damage, 1 Attack Speed, 3 Entity Interaction Range, 2.5 Attack Range, +15% Cooldown Reduction, +15% Lightning Spell Power, +5% Spell Power"
   description: ""
 
 - id: "irons_spellbooks:magehunter"
   name: "Magehunter"
   path: "/img/items/magehunter.png"
-  group: ""
+  group: "Weapons"
   craftingType: "none"
   item0Id: ""
   item0: ""
@@ -625,13 +625,13 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "When in Main Hand:<br>  7 Attack Damage, 1.6 Attack Speed, 2.5 Attack Range, +15% Spell Resistance"
+  tooltip: "When in Main Hand:<br>  7 Attack Damage, 1.6 Attack Speed, 3 Entity Interaction Range, 2.5 Attack Range, +15% Spell Resistance"
   description: ""
 
 - id: "irons_spellbooks:necronomicon_spell_book"
   name: "Necronomicon"
   path: "/img/items/necronomicon_spell_book.png"
-  group: ""
+  group: "Spellbooks"
   craftingType: "none"
   item0Id: ""
   item0: ""
@@ -660,7 +660,7 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "Blood Slash (5), Blood Step (5), Ray of Siphoning (5), Blaze Storm (5)"
+  tooltip: "Unique Spell Book, +1 level to Raise Dead, Press [V] to cast, Inscribed Spells:<br>  [Blood Slash 5], [Blood Step 5], [Ray of Siphoning 5], [Blaze Storm 5], When equipped as Spell Book:<br> +200 Max Mana"
   description: ""
 
 - id: "irons_spellbooks:netherite_spell_book"
@@ -701,7 +701,7 @@
 - id: "irons_spellbooks:rotten_spell_book"
   name: "Rotten Spell Book"
   path: "/img/items/rotten_spell_book.png"
-  group: ""
+  group: "Spellbooks"
   craftingType: "none"
   item0Id: ""
   item0: ""
@@ -736,7 +736,7 @@
 - id: "irons_spellbooks:spellbreaker"
   name: "Spellbreaker"
   path: "/img/items/spellbreaker.png"
-  group: "Tools"
+  group: "Weapons"
   craftingType: "crafting"
   item0Id: ""
   item0: ""
@@ -765,13 +765,13 @@
   item8Id: ""
   item8: ""
   item8Path: ""
-  tooltip: "Can be Imbued (1/1), Two-Handed, When in Main Hand:<br>  10 Attack Damage, 1.8 Attack Speed, 3.25 Attack Range, +15% Cooldown Reduction, Imbued Spell:<br>  [Counterspell 1], 50 Mana Cost, 5s Cooldown"
+  tooltip: "Can be Imbued (1/1), Two-Handed, When in Main Hand:<br>  10 Attack Damage, 1.8 Attack Speed, 3 Entity Interaction Range, 3.25 Attack Range, +15% Cooldown Reduction, Imbued Spell:<br>  [Counterspell 1], 50 Mana Cost, 5s Cooldown"
   description: ""
 
 - id: "irons_spellbooks:villager_spell_book"
   name: "Villager Bible"
   path: "/img/items/villager_spell_book.png"
-  group: ""
+  group: "Spellbooks"
   craftingType: "none"
   item0Id: ""
   item0: ""
diff --git a/_tabs/spellbooks.md b/_tabs/spellbooks.md
index 8727e4d..b39030c 100644
--- a/_tabs/spellbooks.md
+++ b/_tabs/spellbooks.md
@@ -4,10 +4,19 @@ icon: fas fa-book
 order: 2
 toc: true
 ---
+
 {% assign sorted = site.data.spellbook_data | sort: 'name'%}
-{% for recipe in sorted %}
-  {% assign desc = "" | append: site.data.spellbook_descriptions[recipe.id].description %}
-  {% include crafting-table-card.html pixelated="true" desc=desc%}
+{% assign groups = site.data.spellbook_data | group_by: 'group'%}
+{% assign sorted_groups = groups | sort: 'name'%}
+
+{% for group in sorted_groups %}
+<h2 id="{{group.name}}"> {{group.name}}</h2>
+<hr>
+  {% assign sorted_groups = group.items | sort: 'name' %}
+  {% for recipe in sorted_groups %}
+    {% assign desc = "" | append: site.data.spellbook_descriptions[recipe.id].description %}
+    {% include crafting-table-card.html pixelated="true" desc=desc%}
+  {% endfor %}
 {% endfor %}
 
 <!-- buffer for the TOC -->