diff --git a/adventure/Arcanum Worlds; Odyssey of the Dragonlords.json b/adventure/Arcanum Worlds; Odyssey of the Dragonlords.json
index fe2378c204..50956c681b 100644
--- a/adventure/Arcanum Worlds; Odyssey of the Dragonlords.json	
+++ b/adventure/Arcanum Worlds; Odyssey of the Dragonlords.json	
@@ -247,6 +247,11 @@
 							"dream",
 							"scrying"
 						]
+					},
+					"known": {
+						"1": [
+							"message#c"
+						]
 					}
 				}
 			],
@@ -282,7 +287,7 @@
 				{
 					"expanded": {
 						"s1": [
-							"Detect evil and good",
+							"detect evil and good",
 							"identify"
 						],
 						"s2": [
diff --git a/adventure/DMsGuild; Rats of Waterdeep.json b/adventure/DMsGuild; Rats of Waterdeep.json
index 2b01f17575..d53eb45032 100644
--- a/adventure/DMsGuild; Rats of Waterdeep.json	
+++ b/adventure/DMsGuild; Rats of Waterdeep.json	
@@ -1847,6 +1847,24 @@
 				"Master of Pestilence|Druid||Plagues|RatsofWaterdeep|10",
 				"Pestilent Rebirth|Druid||Plagues|RatsofWaterdeep|14"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"infestation|xge#c"
+						]
+					},
+					"prepared": {
+						"6": [
+							"detect poison and disease",
+							"lesser restoration"
+						],
+						"9": [
+							"contagion"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Infestation|xge",
 				"Detect Poison and Disease",
@@ -1861,10 +1879,6 @@
 			"className": "Ranger",
 			"classSource": "PHB",
 			"subclassSpells": [
-				{
-					"className": "Ranger",
-					"classSource": "PHB"
-				},
 				"comprehend languages",
 				"darkness",
 				"fear",
@@ -1876,9 +1890,30 @@
 			"additionalSpells": [
 				{
 					"prepared": {
+						"3": {
+							"ritual": [
+								"animal messenger"
+							]
+						}
+					},
+					"known": {
 						"3": [
-							"animal messenger"
+							"comprehend languages"
+						],
+						"5": [
+							"darkness"
+						],
+						"9": [
+							"fear"
+						],
+						"13": [
+							"greater invisibility"
 						],
+						"17": [
+							"mislead"
+						]
+					},
+					"innate": {
 						"7": [
 							"clairvoyance"
 						]
@@ -1964,6 +1999,12 @@
 			"header": 2,
 			"entries": [
 				"Starting at 10th level, you are immune to disease and gain resistance to poison damage."
+			],
+			"resist": [
+				"poison"
+			],
+			"conditionImmune": [
+				"disease"
 			]
 		},
 		{
@@ -2022,7 +2063,7 @@
 			"name": "Rat Swarm",
 			"entries": [
 				"At 3rd level, you can summon a {@creature swarm of rats} to accompany you and defend you in combat.",
-				"To summon the swarm, you must perform a tenminute ritual within an urban environment. You can perform this ritual a number of times equal to your Wisdom modifier (a minimum of once), but you can only have one swarm active at a time. You regain all expended uses when you finish a long rest. You can use your action to dismiss the swarm, causing it to disassemble and vanish.",
+				"To summon the swarm, you must perform a ten-minute ritual within an urban environment. You can perform this ritual a number of times equal to your Wisdom modifier (a minimum of once), but you can only have one swarm active at a time. You regain all expended uses when you finish a long rest. You can use your action to dismiss the swarm, causing it to disassemble and vanish.",
 				"The swarm acts on its own initiative in combat. On its turn, you can use your Reaction to command the swarm to attack a creature you can see or move its speed to a location you can see. If you don't give the swarm a command, it focuses on protecting you.",
 				"While you have a swarm present, you always have the {@spell animal messenger} spell prepared and can cast it as a ritual. This spell doesn't count against the number of spells you can cast each day."
 			],
diff --git a/adventure/arcanist; The Delian Tomb.json b/adventure/arcanist; The Delian Tomb.json
index 729098d111..b341f26b30 100644
--- a/adventure/arcanist; The Delian Tomb.json	
+++ b/adventure/arcanist; The Delian Tomb.json	
@@ -330,7 +330,7 @@
 									"type": "inset",
 									"name": "Determining Surprise",
 									"entries": [
-										"Before you begin a combat encounter, you must first determine who, if anyone, is {@5etools Surprised|quickreference.html#bookref-quick,3,surprise,0}. If anyone was attempting to be sneaky, prior to the encounter, have them roll a Dexterity ({@skill Stealth}) Ability Check against a DC set by Passive Perception (10 + the Wisdom Modifier) of each creature on the opposing side. A creature actively searching for another creature will roll a Wisdom ({@skill Perception}) check against the Dexterity ({@skill Stealth}) roll of the other creature. If neither side attempts to be stealthy, they notice each other at the same time. A surprised creature cannot take an action or move on their first turn. They cannot take a reaction until after their first turn ends. For complete details regarding the ins and outs of combat, refer to {@5etools Chapter 9 of the Player's Handbook|book.html#phb,9}!"
+										"Before you begin a combat encounter, you must first determine who, if anyone, is {@quickref surprised|PHB|3|0|surprised}. If anyone was attempting to be sneaky, prior to the encounter, have them roll a Dexterity ({@skill Stealth}) Ability Check against a DC set by Passive Perception (10 + the Wisdom Modifier) of each creature on the opposing side. A creature actively searching for another creature will roll a Wisdom ({@skill Perception}) check against the Dexterity ({@skill Stealth}) roll of the other creature. If neither side attempts to be stealthy, they notice each other at the same time. A surprised creature cannot take an action or move on their first turn. They cannot take a reaction until after their first turn ends. For complete details regarding the ins and outs of combat, refer to {@5etools Chapter 9 of the Player's Handbook|book.html#phb,9}!"
 									]
 								}
 							]
diff --git a/book/Goob the Goblin; A Guide for Warlocks, Mysteries of Magic.json b/book/Goob the Goblin; A Guide for Warlocks, Mysteries of Magic.json
index 69d18e809f..a4f0675edb 100644
--- a/book/Goob the Goblin; A Guide for Warlocks, Mysteries of Magic.json	
+++ b/book/Goob the Goblin; A Guide for Warlocks, Mysteries of Magic.json	
@@ -72,8 +72,32 @@
 				"Life Drain|Warlock||The Life Giver|GfW:MoM|10|GfW:MoM",
 				"Magical Refresh|Warlock||The Life Giver|GfW:MoM|14|GfW:MoM"
 			],
-			"casterProgression": "pact",
-			"spellcastingAbility": "cha",
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"ray of sickness",
+							"inflict wounds"
+						],
+						"2": [
+							"blindness/deafness",
+							"silence"
+						],
+						"3": [
+							"feign death",
+							"lightning bolt"
+						],
+						"4": [
+							"greater invisibility",
+							"vitriolic sphere"
+						],
+						"5": [
+							"contagion",
+							"bigby's hand"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"ray of sickness",
 				"inflict wounds",
diff --git a/book/MCDM Productions; Arcadia Issue 1.json b/book/MCDM Productions; Arcadia Issue 1.json
index 6d1a10167f..8a6bbd27d7 100644
--- a/book/MCDM Productions; Arcadia Issue 1.json	
+++ b/book/MCDM Productions; Arcadia Issue 1.json	
@@ -29,10 +29,10 @@
 				"MM"
 			]
 		},
+		"edition": "one",
 		"dateAdded": 1613648837,
 		"dateLastModified": 1734389822,
-		"_dateLastModifiedHash": "fe61b4020c",
-		"edition": "one"
+		"_dateLastModifiedHash": "fe61b4020c"
 	},
 	"subclass": [
 		{
diff --git a/class/AgenderArcee; The Martial Ranger.json b/class/AgenderArcee; The Martial Ranger.json
index 753d762b21..c1579dc3a4 100644
--- a/class/AgenderArcee; The Martial Ranger.json	
+++ b/class/AgenderArcee; The Martial Ranger.json	
@@ -917,6 +917,12 @@
 					}
 				}
 			],
+			"subclassSpells": [
+				"misty step",
+				"dimension door",
+				"teleport",
+				"plane shift"
+			],
 			"subclassFeatures": [
 				"Horizon Walker|Martial Ranger|TMR|Horizon Walker|TMR|3|TMR",
 				"Planar Wanderer|Martial Ranger|TMR|Horizon Walker|TMR|7|TMR",
@@ -1061,19 +1067,36 @@
 				{
 					"known": {
 						"3": [
-							"shillelagh#c"
+							"shillelagh#c",
+							{
+								"choose": "level=0|class=Druid",
+								"count": 2
+							}
+						],
+						"10": [
+							{
+								"choose": "level=0|class=Druid"
+							}
 						]
 					},
 					"innate": {
-						"7": [
-							"speak with animals",
-							"beast sense"
-						],
-						"15": [
-							"speak with plants",
-							"locate creature",
-							"commune with nature"
-						]
+						"7": {
+							"daily": {
+								"1e": [
+									"speak with animals",
+									"beast sense"
+								]
+							}
+						},
+						"15": {
+							"daily": {
+								"1e": [
+									"speak with plants",
+									"locate creature",
+									"commune with nature"
+								]
+							}
+						}
 					}
 				}
 			],
@@ -1085,7 +1108,13 @@
 				{
 					"className": "Ranger",
 					"classSource": "PHB"
-				}
+				},
+				"shillelagh",
+				"speak with animals",
+				"beast sense",
+				"speak with plants",
+				"locate creature",
+				"commune with nature"
 			],
 			"subclassTableGroups": [
 				{
diff --git a/class/Aussifer; Unchained Warlock.json b/class/Aussifer; Unchained Warlock.json
index 83899d9a92..acbad7f564 100644
--- a/class/Aussifer; Unchained Warlock.json	
+++ b/class/Aussifer; Unchained Warlock.json	
@@ -1813,6 +1813,47 @@
 				"Beguiling Defenses|Warlock|UW|Archfey|UW|10",
 				"Dark Delirium|Warlock|UW|Archfey|UW|14"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							{
+								"choose": "level=0|class=druid"
+							}
+						]
+					},
+					"expanded": {
+						"1": [
+							"Faerie Fire",
+							"Sleep"
+						],
+						"3": [
+							"Calm Emotions",
+							"Phantasmal Force"
+						],
+						"5": [
+							"Blink",
+							"Plant Growth"
+						],
+						"6": [
+							"Transport via Plants"
+						],
+						"7": [
+							"Dominate Beast",
+							"Greater Invisibility",
+							"Mirage Arcane"
+						],
+						"8": [
+							"Control Weather"
+						],
+						"9": [
+							"Dominate Person",
+							"Seeming",
+							"shapechange"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Faerie Fire",
 				"Sleep",
@@ -1843,6 +1884,52 @@
 				"Celestial Resilience|Warlock|UW|Celestial|UW|10",
 				"Searing Vengeance|Warlock|UW|Celestial|UW|14"
 			],
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Cure Wounds",
+							"Guiding Bolt"
+						],
+						"3": [
+							"Flaming Sphere",
+							"Lesser Restoration"
+						],
+						"5": [
+							"Daylight",
+							"Revivify"
+						],
+						"6": [
+							"Heal"
+						],
+						"7": [
+							"Guardian of Faith",
+							"Wall of Fire",
+							"Conjure Celestial"
+						],
+						"8": [
+							"Sunburst"
+						],
+						"9": [
+							"Greater Restoration",
+							"Holy Weapon|XGE",
+							"True Resurrection"
+						]
+					},
+					"known": {
+						"1": [
+							{
+								"choose": {
+									"from": [
+										"light#c",
+										"sacred flame#c"
+									]
+								}
+							}
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Cure Wounds",
 				"Guiding Bolt",
@@ -1875,6 +1962,40 @@
 				"Fiendish Resilience|Warlock|UW|Fiend|UW|10",
 				"Hurl Through Hell|Warlock|UW|Fiend|UW|14"
 			],
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Burning Hands",
+							"Command"
+						],
+						"3": [
+							"Blindness/Deafness",
+							"Scorching Ray"
+						],
+						"5": [
+							"Fireball",
+							"Stinking Cloud"
+						],
+						"6": [
+							"Harm"
+						],
+						"7": [
+							"Compulsion",
+							"Wall of Fire",
+							"Fire Storm"
+						],
+						"8": [
+							"Incendiary Cloud"
+						],
+						"9": [
+							"Hallow",
+							"Immolation|XGE",
+							"Meteor Swarm"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Burning Hands",
 				"Command",
@@ -1905,6 +2026,52 @@
 				"Deathwalker's Shield|Warlock|UW|Gatekeeper|UW|10",
 				"Cycle of Demise|Warlock|UW|Gatekeeper|UW|14"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"1": [
+							"bane",
+							"sanctuary"
+						],
+						"3": [
+							"silence",
+							"spiritual weapon"
+						],
+						"5": [
+							"blink",
+							"speak with dead"
+						],
+						"6": [
+							"disintegrate"
+						],
+						"7": [
+							"banishment",
+							"locate creature",
+							"sequester"
+						],
+						"8": [
+							"antimagic field"
+						],
+						"9": [
+							"cone of cold",
+							"teleportation circle",
+							"gate"
+						]
+					},
+					"known": {
+						"1": [
+							{
+								"choose": {
+									"from": [
+										"guidance#c",
+										"toll the dead|XGE#c"
+									]
+								}
+							}
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Bane",
 				"Sanctuary",
@@ -1937,6 +2104,144 @@
 				"Sanctuary Vessel|Warlock|UW|Genie|UW|10",
 				"Limited Wish|Warlock|UW|Genie|UW|14"
 			],
+			"additionalSpells": [
+				{
+					"name": "Dao",
+					"expanded": {
+						"1": [
+							"Sanctuary",
+							"Thunderwave",
+							"Mold Earth|XGE#c"
+						],
+						"3": [
+							"Phantasmal Force",
+							"Spike Growth"
+						],
+						"5": [
+							"Create Food and Water",
+							"Erupting Earth|XGE"
+						],
+						"6": [
+							"Planar Ally"
+						],
+						"7": [
+							"Phantasmal Killer",
+							"Stone Shape",
+							"Project Image"
+						],
+						"8": [
+							"Control Weather"
+						],
+						"9": [
+							"Creation",
+							"Wall of Stone",
+							"Wish"
+						]
+					}
+				},
+				{
+					"name": "Djinni",
+					"expanded": {
+						"1": [
+							"Sanctuary",
+							"Thunderwave",
+							"Gust|XGE#c"
+						],
+						"3": [
+							"Phantasmal Force",
+							"Gust of Wind"
+						],
+						"5": [
+							"Create Food and Water",
+							"Wind Wall"
+						],
+						"6": [
+							"Planar Ally"
+						],
+						"7": [
+							"Phantasmal Killer",
+							"Greater Invisibility",
+							"Project Image"
+						],
+						"8": [
+							"Control Weather"
+						],
+						"9": [
+							"Creation",
+							"Seeming",
+							"Wish"
+						]
+					}
+				},
+				{
+					"name": "Efreeti",
+					"expanded": {
+						"1": [
+							"Sanctuary",
+							"Searing Smite",
+							"Control Flames|XGE#c"
+						],
+						"3": [
+							"Phantasmal Force",
+							"Scorching Ray"
+						],
+						"5": [
+							"Create Food and Water",
+							"Fireball"
+						],
+						"6": [
+							"Planar Ally"
+						],
+						"7": [
+							"Phantasmal Killer",
+							"Fire Shield",
+							"Project Image"
+						],
+						"8": [
+							"Control Weather"
+						],
+						"9": [
+							"Creation",
+							"Flame Strike",
+							"Wish"
+						]
+					}
+				},
+				{
+					"name": "Marid",
+					"expanded": {
+						"1": [
+							"Sanctuary",
+							"Fog Cloud",
+							"Shape Water|XGE#c"
+						],
+						"3": [
+							"Phantasmal Force",
+							"Blur"
+						],
+						"5": [
+							"Create Food and Water",
+							"Control Water"
+						],
+						"6": [
+							"Planar Ally"
+						],
+						"7": [
+							"Phantasmal Killer",
+							"Fire Shield",
+							"Project Image"
+						],
+						"8": [
+							"Control Weather"
+						],
+						"9": [
+							"Creation",
+							"Cone of Cold",
+							"Wish"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Detect Evil and Good",
 				"Phantasmal Force",
@@ -1976,7 +2281,6 @@
 				"Marid": [
 					"Fog Cloud",
 					"Blur",
-					"Tidal Wave|XGE",
 					"Control Water",
 					"Cone of Cold",
 					"Shape Water|XGE"
@@ -1996,6 +2300,41 @@
 				"Thought Shield|Warlock|UW|Great Old One|UW|10",
 				"Create Thrall|Warlock|UW|Great Old One|UW|14"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"1": [
+							"dissonant whispers",
+							"Tasha's hideous laughter",
+							"mind sliver|TCE#c"
+						],
+						"3": [
+							"detect thoughts",
+							"Tasha's mind whip|TCE"
+						],
+						"5": [
+							"clairvoyance",
+							"sending"
+						],
+						"6": [
+							"programmed illusion"
+						],
+						"7": [
+							"confusion",
+							"evard's black tentacles",
+							"symbol"
+						],
+						"8": [
+							"mind blank"
+						],
+						"9": [
+							"dominate person",
+							"telekinesis",
+							"time stop"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Dissonant Whispers",
 				"Tasha's Hideous Laughter",
@@ -2027,6 +2366,40 @@
 				"Armor of Hexes|Warlock|UW|Hexblade|UW|10",
 				"Master of Hexes|Warlock|UW|Hexblade|UW|14"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"1": [
+							"wrathful smite",
+							"shield"
+						],
+						"3": [
+							"blur",
+							"magic weapon"
+						],
+						"5": [
+							"blink",
+							"elemental weapon"
+						],
+						"6": [
+							"blade barrier"
+						],
+						"7": [
+							"phantasmal killer",
+							"staggering smite",
+							"mordenkainen's sword"
+						],
+						"8": [
+							"illusory dragon|XGE"
+						],
+						"9": [
+							"banishing smite",
+							"cone of cold",
+							"time stop"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Shield",
 				"Wrathful Smite",
@@ -2057,6 +2430,40 @@
 				"Devouring Depths|Warlock|UW|Leviathan|UW|10",
 				"Call of the Leviathan|Warlock|UW|Leviathan|UW|14"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"1": [
+							"create or destroy water",
+							"thunderwave"
+						],
+						"3": [
+							"gust of wind",
+							"silence"
+						],
+						"5": [
+							"lightning bolt",
+							"sleet storm"
+						],
+						"6": [
+							"chain lightning"
+						],
+						"7": [
+							"control water",
+							"summon elemental|TCE",
+							"teleport"
+						],
+						"8": [
+							"tsunami"
+						],
+						"9": [
+							"bigby's hand",
+							"cone of cold",
+							"storm of vengeance"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Create or Destroy Water",
 				"Thunderwave",
@@ -2087,6 +2494,52 @@
 				"Infusion of Eloquence|Warlock|UW|Logos|UW|10",
 				"The True Word|Warlock|UW|Logos|UW|14"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"1": [
+							"command",
+							"healing word"
+						],
+						"3": [
+							"blindness/deafness",
+							"suggestion"
+						],
+						"5": [
+							"sending",
+							"tongues"
+						],
+						"6": [
+							"word of recall"
+						],
+						"7": [
+							"banishment",
+							"compulsion",
+							"divine word"
+						],
+						"8": [
+							"telepathy"
+						],
+						"9": [
+							"dominate person",
+							"rary's telepathic bond",
+							"power word heal"
+						]
+					},
+					"known": {
+						"1": [
+							{
+								"choose": {
+									"from": [
+										"vicious mockery#c",
+										"word of radiance|XGE#c"
+									]
+								}
+							}
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Command",
 				"Healing Word",
@@ -2119,6 +2572,41 @@
 				"Mortal Husk|Warlock|UW|Undying|UW|10",
 				"Spirit Projection|Warlock|UW|Undying|UW|14"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"1": [
+							"bane",
+							"false life",
+							"spare the dying#c"
+						],
+						"3": [
+							"blindness/deafness",
+							"phantasmal force"
+						],
+						"5": [
+							"feign death",
+							"speak with dead"
+						],
+						"6": [
+							"magic jar"
+						],
+						"7": [
+							"death ward",
+							"greater invisibility",
+							"regenerate"
+						],
+						"8": [
+							"clone"
+						],
+						"9": [
+							"antilife shell",
+							"contagion",
+							"invulnerability|XGE"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Bane",
 				"False Life",
diff --git a/class/Avaricium; Arbiter.json b/class/Avaricium; Arbiter.json
index ff8af715c1..707e5fc1d0 100644
--- a/class/Avaricium; Arbiter.json	
+++ b/class/Avaricium; Arbiter.json	
@@ -694,6 +694,34 @@
 			],
 			"casterProgression": "1/3",
 			"spellcastingAbility": "wis",
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							{
+								"choose": "level=0|class=cleric"
+							}
+						],
+						"3": [
+							{
+								"choose": "level=0|class=cleric"
+							}
+						],
+						"10": [
+							{
+								"choose": "level=0|class=cleric"
+							}
+						]
+					},
+					"expanded": {
+						"3": [
+							{
+								"all": "class=cleric"
+							}
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				{
 					"className": "Cleric",
@@ -1717,12 +1745,10 @@
 				{
 					"type": "entries",
 					"name": "Spellcasting Ability",
-					"page": 0,
 					"entries": [
 						"Wisdom is your spellcasting ability for your cleric spells. The power of your spells comes from the primordial threads that you possess, awakened by your adherence to the person you aid. You use your Wisdom whenever a cleric spell refers to your spellcasting ability. In addition, you use your Wisdom modifier when setting the saving throw DC for a cleric spell you cast and when making an attack roll with one.",
 						{
 							"type": "inset",
-							"name": "",
 							"entries": [
 								{
 									"type": "abilityDc",
diff --git a/class/Benjamin Huffman; The Magus.json b/class/Benjamin Huffman; The Magus.json
index 8f532e7ff8..fb19668d76 100644
--- a/class/Benjamin Huffman; The Magus.json	
+++ b/class/Benjamin Huffman; The Magus.json	
@@ -14,8 +14,7 @@
 				],
 				"version": "1.1",
 				"color": "75ccfa",
-				"url": "https://www.dmsguild.com/product/200237/the-Magus-Class",
-				"targetSchema": "1.2"
+				"url": "https://www.dmsguild.com/product/200237/the-Magus-Class"
 			}
 		],
 		"dateAdded": 1683052728,
@@ -732,6 +731,100 @@
 				"Occult Savant|Magus|BHMagus|Arcane Order|BHMagus|7",
 				"Arcane Recovery|Magus|BHMagus|Arcane Order|BHMagus|14"
 			],
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Alarm",
+							"Animate Objects",
+							"Arcane Eye",
+							"Arcane Gate",
+							"Arcing Arrow|BHM",
+							"Banishment",
+							"Bigby's Hand",
+							"Blade Ward",
+							"Blink",
+							"Blur",
+							"Clairvoyance",
+							"Cloud of Daggers",
+							"Color Spray",
+							"Comprehend Languages",
+							"Confusion",
+							"Contact Other Plane",
+							"Contingency",
+							"Counterspell",
+							"Create Homunculus|XGE",
+							"Creation",
+							"Crown of Madness",
+							"Dancing Lights",
+							"Darkness",
+							"Darkvision",
+							"Detect Magic",
+							"Dimension Door",
+							"Disintegrate",
+							"Dispel Magic",
+							"Drawmij's Instant Summons",
+							"Enlarge/Reduce",
+							"Evard's Black Tentacles",
+							"Fabricate",
+							"False Life",
+							"Far Step|XGE",
+							"Feather Fall",
+							"Find Familiar",
+							"Fireball",
+							"Fly",
+							"Grease",
+							"Green-Flame Blade|tce",
+							"Hallucinatory Terrain",
+							"Haste",
+							"Hold Monster",
+							"Hold Person",
+							"Hypnotic Pattern",
+							"Identify",
+							"Invisibility",
+							"Leomund's Secret Chest",
+							"Leomund's Tiny Hut",
+							"Levitate",
+							"Locate Creature",
+							"Mage Hand",
+							"Magic Circle",
+							"Magic Jar",
+							"Magic Missile",
+							"Message",
+							"Minor Illusion",
+							"Misty Step",
+							"Nystul's Magic Aura",
+							"Passwall",
+							"Phantasmal Force",
+							"Prestidigitation",
+							"Rope Trick",
+							"Scatter|XGE",
+							"Scrying",
+							"See Invisibility",
+							"Shield",
+							"Sleep",
+							"Slow",
+							"Spell-Shattering Strike|BHM",
+							"Sword Burst|tce",
+							"Teleportation Circle",
+							"Tenser's Floating Disk",
+							"Tiny Servant|XGE",
+							"Tongues",
+							"True Seeing",
+							"True Strike",
+							"Vortex Dart|BHM"
+						]
+					},
+					"known": {
+						"7": [
+							{
+								"choose": "subclass=magus: primordial seal (bhm);magus: arcane order (bhm);magus: shadow court (bhm);magus: sylvan circle (bhm);magus: knights stygian (bhm);magus: sidereal cabal (bhm)",
+								"count": 2
+							}
+						]
+					}
+				}
+			],
 			"spellcastingAbility": "int",
 			"subclassSpells": [
 				"Alarm",
@@ -827,8 +920,93 @@
 				"Face of Fear|Magus|BHMagus|Knights Stygian|BHMagus|7",
 				"Necromantic Surge|Magus|BHMagus|Knights Stygian|BHMagus|14"
 			],
-			"casterProgression": "1/2",
 			"spellcastingAbility": "cha",
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Animate Dead",
+							"Arms of Hadar",
+							"Aspir|BHM",
+							"Bane",
+							"Banishment",
+							"Bestow Curse",
+							"Blade Ward",
+							"Blight",
+							"Blindness/Deafness",
+							"Bloodletting Bite|BHM",
+							"Cause Fear|XGE",
+							"Chill Touch",
+							"Circle of Death",
+							"Cloudkill",
+							"Contagion",
+							"Corpse Mask|BHM",
+							"Create Undead",
+							"Crown of Madness",
+							"Danse Macabre|XGE",
+							"Darkness",
+							"Darkvision",
+							"Death Shroud|BHM",
+							"Death Ward",
+							"Detect Poison and Disease",
+							"Disintegrate",
+							"Dispel Magic",
+							"Dissonant Whispers",
+							"Dominate Beast",
+							"Drain|BHM",
+							"Enervation|XGE",
+							"Evard's Black Tentacles",
+							"Eyebite",
+							"False Life",
+							"Fear",
+							"Feign Death",
+							"Gaseous Form",
+							"Gentle Repose",
+							"Hallow",
+							"Harm",
+							"Hex",
+							"Hunger of Hadar",
+							"Inflict Wounds",
+							"Insect Plague",
+							"Magic Jar",
+							"Mending",
+							"Negative Energy Flood|XGE",
+							"Passwall",
+							"Phantasmal Force",
+							"Phantasmal Killer",
+							"Phantom Steed",
+							"Raise Dead",
+							"Ray of Enfeeblement",
+							"Ray of Sickness",
+							"Resistance",
+							"Revivify",
+							"See Invisibility",
+							"Shatter",
+							"Silence",
+							"Sleep",
+							"Slow",
+							"Soul Cage|XGE",
+							"Spare the Dying",
+							"Speak with Dead",
+							"Spider Climb",
+							"Tasha's Hideous Laughter",
+							"Thaumaturgy",
+							"True Strike",
+							"Vampiric Touch",
+							"Web"
+						]
+					},
+					"innate": {
+						"14": {
+							"daily": {
+								"1": [
+									"animate dead"
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassSpells": [
 				"Animate Dead",
 				"Arms of Hadar",
@@ -914,8 +1092,110 @@
 				"Elemental Alignment|Magus|BHMagus|Primordial Seal|BHMagus|7",
 				"Elemental Attunement|Magus|BHMagus|Primordial Seal|BHMagus|14"
 			],
-			"casterProgression": "1/2",
 			"spellcastingAbility": "cha",
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Absorb Elements|XGE",
+							"Acid Splash",
+							"Aganazzar's Scorcher|XGE",
+							"Alarm",
+							"Arcane Lock",
+							"Arcing Arrow|BHM",
+							"Booming Blade|tce",
+							"Burning Hands",
+							"Call Lightning",
+							"Catapult|XGE",
+							"Chain Lightning",
+							"Chromatic Orb",
+							"Cone of Cold",
+							"Conjure Elemental",
+							"Conjure Minor",
+							"Control Flames|XGE",
+							"Control Water",
+							"Control Winds|XGE",
+							"Create Bonfire|XGE",
+							"Detect Magic",
+							"Dust Devil|XGE",
+							"Earthbind|XGE",
+							"Earth Tremor|XGE",
+							"Elemental Bane|XGE",
+							"Elementals",
+							"Erupting Earth|XGE",
+							"Feather Fall",
+							"Fireball",
+							"Fire Shield",
+							"Flame Arrows|XGE",
+							"Flaming Sphere",
+							"Flesh to Stone",
+							"Gaseous Form",
+							"Green-Flame Blade|tce",
+							"Gust of Wind",
+							"Gust|XGE",
+							"Ice Knife|XGE",
+							"Ice Storm",
+							"Immolation|XGE",
+							"Investiture of Flame|XGE",
+							"Investiture of Ice|XGE",
+							"Investiture of Stone|XGE",
+							"Investiture of Wind|XGE",
+							"Knock",
+							"Lightning Bolt",
+							"Maximilian's Earthen Grasp|XGE",
+							"Meld into Stone",
+							"Melf's Acid Arrow",
+							"Mold Earth|XGE",
+							"Move Earth",
+							"Otiluke's Freezing Sphere",
+							"Primordial Ward|XGE",
+							"Pyrotechnics",
+							"Rime Strike|BHM",
+							"Scorching Ray",
+							"Shape Water|XGE",
+							"Shatter",
+							"Sleet Storm",
+							"Snilloc's Snowball Swarm|XGE",
+							"Stone Shape",
+							"Storm Sphere|XGE",
+							"Storm Step|BHM",
+							"Thunderwave",
+							"Tidal Wave|XGE",
+							"Transmute Rock|XGE",
+							"Wall of Fire",
+							"Wall of Ice",
+							"Wall of Sand|XGE",
+							"Wall of Stone",
+							"Wall of Wate|XGE",
+							"Warding Wind|XGE",
+							"Water Walk",
+							"Watery Sphere|XGE",
+							"Wind Walk",
+							"Wind Wall",
+							"Witchbolt"
+						]
+					},
+					"innate": {
+						"14": {
+							"daily": {
+								"1": [
+									{
+										"choose": {
+											"from": [
+												"Investiture of Flame|XGE",
+												"Investiture of Ice|XGE",
+												"Investiture of Stone|XGE",
+												"Investiture of Wind|XGE"
+											],
+											"count": 1
+										}
+									}
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassSpells": [
 				"Absorb Elements|XGE",
 				"Acid Splash",
@@ -1008,8 +1288,87 @@
 				"Broken Mirror Jutsu|Magus|BHMagus|Shadow Court|BHMagus|7",
 				"False Body Jutsu|Magus|BHMagus|Shadow Court|BHMagus|14"
 			],
-			"casterProgression": "1/2",
 			"spellcastingAbility": "int",
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Alarm",
+							"Blink",
+							"Blur",
+							"Clairvoyance",
+							"Confusion",
+							"Corrupted Ki Kata|BHM",
+							"Dancing Lights",
+							"Darkness",
+							"Darkvision",
+							"Death Shroud|BHM",
+							"Dimension Door",
+							"Disguise Self",
+							"Dispel Magic",
+							"Dominate Person",
+							"Dream",
+							"Enemies Abound|XGE",
+							"Expeditious Retreat",
+							"Eyebite",
+							"Fear",
+							"Feather Fall",
+							"Feign Death",
+							"Find the Path",
+							"Find Traps",
+							"Fog Cloud",
+							"Freedom of Movement",
+							"Gaseous Form",
+							"Grease",
+							"Greater Invisibility",
+							"Guards and Wards",
+							"Hallucinatory Terrain",
+							"Hold Monster",
+							"Hold Person",
+							"Illusory Script",
+							"Invisibility",
+							"Jump",
+							"Knock",
+							"Leomund's Secret Chest",
+							"Locate Creature",
+							"Locate Object",
+							"Longstrider",
+							"Mage Hand",
+							"Major Image",
+							"Mental Prison|XGE",
+							"Message",
+							"Minor Illusion",
+							"Mirror Image",
+							"Mislead",
+							"Misty Step",
+							"Modify Memory",
+							"Nerve Pinching Kata|BHM",
+							"Nondetection",
+							"Passwall",
+							"Pass Without Trace",
+							"Phantasmal Killer",
+							"Polymorph",
+							"Programmed Illusion",
+							"Protection from Poison",
+							"Rope Trick",
+							"Scrying",
+							"See Invisibility",
+							"Seeming",
+							"Sending",
+							"Silence",
+							"Silent Image",
+							"Sleep",
+							"Snare|XGE",
+							"Ten Thousand Masks|BHM",
+							"True Seeing",
+							"Unseen Servant",
+							"Vampiric Touch",
+							"Water Breathing",
+							"Wind Walk"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Alarm",
 				"Blink",
@@ -1098,8 +1457,99 @@
 				"Celestial Clockwork Control|Magus|BHMagus|Sidereal Cabal|BHMagus|7",
 				"Seal Fate|Magus|BHMagus|Sidereal Cabal|BHMagus|14"
 			],
-			"casterProgression": "1/2",
 			"spellcastingAbility": "int",
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Arcane Eye",
+							"Arcane Gate",
+							"Augury",
+							"Bane",
+							"Banishment",
+							"Bestow Curse",
+							"Blade Ward",
+							"Bless",
+							"Blinding Smite",
+							"Blur",
+							"Calm Emotions",
+							"Catnap|XGE",
+							"Charm Person",
+							"Clairvoyance",
+							"Command",
+							"Comprehend Languages",
+							"Counterspell",
+							"Dancing Lights",
+							"Darkness",
+							"Darkvision",
+							"Dawn|XGE",
+							"Daylight",
+							"Detect Evil and Good",
+							"Detect Magic",
+							"Detect Thoughts",
+							"Dimension Door",
+							"Dispel Evil and Good",
+							"Divination",
+							"Dream",
+							"Enemies Abound|XGE",
+							"Faerie Fire",
+							"Far Step|XGE",
+							"Feather Fall",
+							"Find the Path",
+							"Find Traps",
+							"Find Vessel|BHM",
+							"Fly",
+							"Forbiddance",
+							"Geas",
+							"Greater Restoration",
+							"Guidance",
+							"Guiding Bolt",
+							"Haste",
+							"Hold Monster",
+							"Hold Person",
+							"Identify",
+							"Illusory Script",
+							"Jump",
+							"Legend Lore",
+							"Lesser Restoration",
+							"Levitate",
+							"Locate Creature",
+							"Locate Object",
+							"Longstrider",
+							"Mage Hand",
+							"Magic Missile",
+							"Melf's Minute",
+							"Message",
+							"Meteors|XGE",
+							"Mind Spike|XGE",
+							"Minor Illusion",
+							"Misfortune's Mark|BHM",
+							"Misty Step",
+							"Moonbeam",
+							"Nondetection",
+							"Otiluke's Resilient Sphere",
+							"Protection from Evil and Good",
+							"Remove Curse",
+							"Sanctuary",
+							"Scatter|XGE",
+							"Scrying",
+							"See Invisibility",
+							"Shillelagh",
+							"Silent Image",
+							"Skill Empowerment|XGE",
+							"Sleep",
+							"Slow",
+							"Sunbeam",
+							"Synaptic Static|XGE",
+							"Telekinesis",
+							"True Seeing",
+							"True Strike",
+							"Vortex Dart|BHM",
+							"Wall of Light|XGE"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Arcane Eye",
 				"Arcane Gate",
@@ -1200,8 +1650,101 @@
 				"Nature's Mask|Magus|BHMagus|Sylvan Circle|BHMagus|7",
 				"Font of Life|Magus|BHMagus|Sylvan Circle|BHMagus|14"
 			],
-			"casterProgression": "1/2",
 			"spellcastingAbility": "wis",
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Alter Self",
+							"Animal Friendship",
+							"Animal Messenger",
+							"Awaken",
+							"Barkskin",
+							"Beast Bond|XGE",
+							"Beast Sense",
+							"Blight",
+							"Booming Blade|tce",
+							"Commune with Nature",
+							"Conjure Animals",
+							"Conjure Woodland Beings",
+							"Contagion",
+							"Create or Destroy Water",
+							"Cure Wounds",
+							"Darkvision",
+							"Daylight",
+							"Death Ward",
+							"Detect Poison and Disease",
+							"Dispel Magic",
+							"Dominate Beast",
+							"Druidcraft",
+							"Druid Grove|XGE",
+							"Enhance Ability",
+							"Ensnaring Strike",
+							"Entangle",
+							"Find the Path",
+							"Fog Cloud",
+							"Fungal Bloom|BHM",
+							"Giant Insect",
+							"Give Life|BHM",
+							"Goodberry",
+							"Grasping Vine",
+							"Greater Restoration",
+							"Guardian of Nature|XGE",
+							"Gust of Wind",
+							"Hail of Thorns",
+							"Heal",
+							"Heroes' Feast",
+							"Insect Plague",
+							"Jump",
+							"Lesser Restoration",
+							"Light",
+							"Locate Animals or Plants",
+							"Locate Creature",
+							"Longstrider",
+							"Magic Stone|XGE",
+							"Meld into Stone",
+							"Moonbeam",
+							"Pass without Trace",
+							"Plant Growth",
+							"Polymorph",
+							"Protection from Energy",
+							"Protection from Poison",
+							"Purify Food and Drink",
+							"Reincarnate",
+							"Resistance",
+							"Revivify",
+							"Rime Strike|BHM",
+							"Skywrite XGE",
+							"Spare the Dying",
+							"Speak with Animals",
+							"Speak with Plants",
+							"Spike Growth",
+							"Spore Cloud|BHM",
+							"Stinking Cloud",
+							"Stone Shape",
+							"Sunbeam",
+							"Thornwhip",
+							"Transport via Plants",
+							"Tree Stride",
+							"Wall of Thorns",
+							"Warden's Rebuke|BHM",
+							"Warding Wind|XGE",
+							"Water Breathing",
+							"Water Walk",
+							"Wrath of Nature|XGE"
+						]
+					},
+					"innate": {
+						"7": {
+							"daily": {
+								"1": [
+									"polymorph"
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassSpells": [
 				"Alter Self",
 				"Animal Friendship",
@@ -1633,7 +2176,7 @@
 			"level": 1,
 			"header": 1,
 			"entries": [
-				"The Arcane Order is an eldritch society built on mentorstudent relationships. While the Order is unified in name, each member tends to operate alone or with only their mentor or apprentice\u2014though in times of extreme circumstance, members will come together to face grave, large scale threats. Each magus of the Arcane Order takes a unique philosophical approach to their teachings, often adopting or adapting the ideals of their mentor. All scholars of the Arcane Order, however, emphasize exceptional technique and approach magic as an art to be mastered.",
+				"The Arcane Order is an eldritch society built on mentor-student relationships. While the Order is unified in name, each member tends to operate alone or with only their mentor or apprentice\u2014though in times of extreme circumstance, members will come together to face grave, large scale threats. Each magus of the Arcane Order takes a unique philosophical approach to their teachings, often adopting or adapting the ideals of their mentor. All scholars of the Arcane Order, however, emphasize exceptional technique and approach magic as an art to be mastered.",
 				{
 					"type": "refSubclassFeature",
 					"subclassFeature": "Arcane Order Initiate|Magus|BHMagus|Arcane Order|BHMagus|1"
@@ -1731,7 +2274,7 @@
 					"type": "entries",
 					"name": "Arcane Aegis",
 					"entries": [
-						" When a target protected by your aegis takes damage from a creature you can use your reaction to remove the aegis from that ally. When you do, you may teleport up to 30 feet and make a weapon attack against the attacking creature."
+						"When a target protected by your aegis takes damage from a creature you can use your reaction to remove the aegis from that ally. When you do, you may teleport up to 30 feet and make a weapon attack against the attacking creature."
 					]
 				}
 			]
@@ -1747,7 +2290,7 @@
 			"level": 7,
 			"header": 2,
 			"entries": [
-				"By 7th level, through diplomacy, espionage, or occultexperimentation you have gleaned how to use spells normally used by other eldritch societies. Alternatively, you've spent time further deciphering the obscure teachings of the Arcane Order. You learn two spells of your choice from any eldritch society's spell list. These spells must be of a level you can cast, as shown on the Magus table, or cantrips. The chosen spells count as Arcane Order magus spells for you and do not count towards the Spells Known column of the Magus table."
+				"By 7th level, through diplomacy, espionage, or occult experimentation you have gleaned how to use spells normally used by other eldritch societies. Alternatively, you've spent time further deciphering the obscure teachings of the Arcane Order. You learn two spells of your choice from any eldritch society's spell list. These spells must be of a level you can cast, as shown on the Magus table, or cantrips. The chosen spells count as Arcane Order magus spells for you and do not count towards the Spells Known column of the Magus table."
 			]
 		},
 		{
diff --git a/class/Blackbando; Ninja.json b/class/Blackbando; Ninja.json
index fe62c7e4f5..23db9e7f01 100644
--- a/class/Blackbando; Ninja.json	
+++ b/class/Blackbando; Ninja.json	
@@ -2006,13 +2006,27 @@
 				"Target Weakness|Ninja|BBNinja|Death|BBNinja|11|BBNinja",
 				"Lethality|Ninja|BBNinja|Death|BBNinja|18|BBNinja"
 			],
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Destructive wave",
+							"Spirit shroud|TCE",
+							"Disintegrate",
+							"Zephyr strike|XGE",
+							"Shadow of Moil|XGE",
+							"Misty step"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Destructive wave",
-				"Spirit shroud|TCE",
 				"Disintegrate",
-				"Zephyr strike|XGE",
+				"Misty step",
 				"Shadow of Moil|XGE",
-				"Misty step"
+				"Spirit shroud|TCE",
+				"Zephyr strike|XGE"
 			],
 			"fluff": {
 				"images": [
@@ -2039,54 +2053,109 @@
 				"Arcane Knowledge|Ninja|BBNinja|Magic|BBNinja|11|BBNinja",
 				"Forbidden Jutsu|Ninja|BBNinja|Magic|BBNinja|18|BBNinja"
 			],
+			"additionalSpells": [
+				{
+					"expanded": {
+						"3": [
+							"Animal messenger",
+							"Arcane gate",
+							"Bigby's hand",
+							"Blight",
+							"Charm person",
+							"Color spray",
+							"Cone of cold",
+							"Conjure animals",
+							"Conjure barrage",
+							"Conjure fey",
+							"Conjure volley",
+							"Control water",
+							"Destructive wave",
+							"Disintegrate",
+							"Dissonant whispers",
+							"Dominate beast",
+							"Dominate person",
+							"Entangle",
+							"Enthrall",
+							"Fast friends|AI",
+							"Fireball",
+							"Giant insect",
+							"Hellish rebuke",
+							"Hold monster",
+							"Ice knife|XGE",
+							"Ice storm",
+							"Insect plague",
+							"Levitate",
+							"Lightning bolt",
+							"Magic missile",
+							"Mass suggestion",
+							"Misty step",
+							"Polymorph",
+							"Scorching ray",
+							"Shadow of Moil|XGE",
+							"Shield",
+							"Silence",
+							"Speak with animals",
+							"Spirit shroud|TCE",
+							"Spiritual weapon",
+							"Suggestion",
+							"Summon shadowspawn|TCE",
+							"Tasha's hideous laughter",
+							"Thunderwave",
+							"Vampiric touch",
+							"Wall of force",
+							"Zephyr strike|XGE"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
-				"Lightning bolt",
-				"Blight",
-				"Control water",
-				"Wall of force",
-				"Ice storm",
-				"Polymorph",
+				"Animal messenger",
+				"Arcane gate",
 				"Bigby's hand",
+				"Blight",
+				"Charm person",
+				"Color spray",
 				"Cone of cold",
-				"Conjure volley",
-				"Arcane gate",
-				"Hold monster",
-				"Fireball",
-				"Thunderwave",
+				"Conjure animals",
 				"Conjure barrage",
-				"Color spray",
+				"Conjure fey",
+				"Conjure volley",
+				"Control water",
+				"Destructive wave",
+				"Disintegrate",
+				"Dissonant whispers",
+				"Dominate beast",
+				"Dominate person",
 				"Entangle",
+				"Enthrall",
+				"Fast friends|AI",
+				"Fireball",
+				"Giant insect",
 				"Hellish rebuke",
+				"Hold monster",
 				"Ice knife|XGE",
-				"Spiritual weapon",
+				"Ice storm",
+				"Insect plague",
+				"Levitate",
+				"Lightning bolt",
 				"Magic missile",
-				"Silence",
+				"Mass suggestion",
+				"Misty step",
+				"Polymorph",
 				"Scorching ray",
+				"Shadow of Moil|XGE",
 				"Shield",
-				"Destructive wave",
+				"Silence",
+				"Speak with animals",
 				"Spirit shroud|TCE",
-				"Disintegrate",
-				"Zephyr strike|XGE",
-				"Shadow of Moil|XGE",
-				"Misty step",
-				"Dominate person",
-				"Tasha's hideous laughter",
-				"Mass suggestion",
-				"Fast friends|AI",
-				"Enthrall",
-				"Dominate beast",
+				"Spiritual weapon",
 				"Suggestion",
-				"Vampiric touch",
-				"Charm person",
-				"Speak with animals",
-				"Levitate",
-				"Giant insect",
-				"Insect plague",
 				"Summon shadowspawn|TCE",
-				"Dissonant whispers",
-				"Conjure fey",
-				"Conjure animals",
-				"Animal messenger"
+				"Tasha's hideous laughter",
+				"Thunderwave",
+				"Vampiric touch",
+				"Wall of force",
+				"Zephyr strike|XGE"
 			],
 			"fluff": {
 				"images": [
@@ -2113,16 +2182,33 @@
 				"Object of Affection|Ninja|BBNinja|Seduction|BBNinja|11|BBNinja",
 				"Forced Friendship|Ninja|BBNinja|Seduction|BBNinja|18|BBNinja"
 			],
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Charm person",
+							"Dominate beast",
+							"Dominate person",
+							"Enthrall",
+							"Fast friends|AI",
+							"Mass suggestion",
+							"Suggestion",
+							"Tasha's hideous laughter",
+							"Vampiric touch"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
+				"Charm person",
+				"Dominate beast",
 				"Dominate person",
-				"Tasha's hideous laughter",
-				"Mass suggestion",
-				"Fast friends|AI",
 				"Enthrall",
-				"Dominate beast",
+				"Fast friends|AI",
+				"Mass suggestion",
 				"Suggestion",
-				"Vampiric touch",
-				"Charm person"
+				"Tasha's hideous laughter",
+				"Vampiric touch"
 			],
 			"fluff": {
 				"images": [
@@ -2149,16 +2235,33 @@
 				"One of Shadows|Ninja|BBNinja|Flock|BBNinja|11|BBNinja",
 				"Gift of Wings|Ninja|BBNinja|Flock|BBNinja|18|BBNinja"
 			],
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"Animal messenger",
+							"Conjure animals",
+							"Conjure fey",
+							"Dissonant whispers",
+							"Giant insect",
+							"Insect plague",
+							"Levitate",
+							"Speak with animals",
+							"Summon shadowspawn|TCE"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
-				"Speak with animals",
-				"Levitate",
+				"Animal messenger",
+				"Conjure animals",
+				"Conjure fey",
+				"Dissonant whispers",
 				"Giant insect",
 				"Insect plague",
-				"Summon shadowspawn|TCE",
-				"Dissonant whispers",
-				"Conjure fey",
-				"Conjure animals",
-				"Animal messenger"
+				"Levitate",
+				"Speak with animals",
+				"Summon shadowspawn|TCE"
 			],
 			"fluff": {
 				"images": [
diff --git a/class/Brad Johns; The Harbinger.json b/class/Brad Johns; The Harbinger.json
index 3fe07e882b..eed75ced30 100644
--- a/class/Brad Johns; The Harbinger.json	
+++ b/class/Brad Johns; The Harbinger.json	
@@ -13,8 +13,7 @@
 				],
 				"version": "3.0",
 				"color": "d5b386",
-				"url": "https://drive.google.com/file/d/1wvAB43LGdQ-wD6G2OVNiFRuGMD8NGWbE/view",
-				"targetSchema": "1.2"
+				"url": "https://drive.google.com/file/d/1wvAB43LGdQ-wD6G2OVNiFRuGMD8NGWbE/view"
 			}
 		],
 		"dateAdded": 1623125586,
@@ -1424,7 +1423,7 @@
 			"level": 14,
 			"header": 2,
 			"entries": [
-				"Starting at 14th level, the divine magic within you bursts out. You sprout angelic wings which grant you a flying speed equal to your walking speed. Armor must be specially modified to accomodate these wings."
+				"Starting at 14th level, the divine magic within you bursts out. You sprout angelic wings which grant you a flying speed equal to your walking speed. Armor must be specially modified to accommodate these wings."
 			]
 		},
 		{
@@ -1513,7 +1512,7 @@
 			"level": 2,
 			"header": 1,
 			"entries": [
-				"Starting at 2nd level, you gain the ability to cover your skin in hardened, stone-like armor. As a bonus action, you can gain armor for the next minute. While this feature is active, your Armor Class is 13 + your Constitution modifer and you have resistance to bludgeoning, piercing, and slashing damage. You gain no benefit from wearing armor while this feature is active, but you can use a shield as normal.",
+				"Starting at 2nd level, you gain the ability to cover your skin in hardened, stone-like armor. As a bonus action, you can gain armor for the next minute. While this feature is active, your Armor Class is 13 + your Constitution modifier and you have resistance to bludgeoning, piercing, and slashing damage. You gain no benefit from wearing armor while this feature is active, but you can use a shield as normal.",
 				"You can use this feature a number of times equal to your Wisdom modifier (minimum of once) and regain all expended uses on a long rest."
 			]
 		},
@@ -2095,7 +2094,7 @@
 			"level": 10,
 			"header": 2,
 			"entries": [
-				"Starting at 10th level, your volcanic core heats up as if an entire magma chamber resided inside you. Creatures that fail the saving throw against your Volcanic Core feature also take 1d10 fire damage."
+				"Starting at 10th level, your volcanic core heats up as if an entire magma chamber resided inside you. Creatures that fail the saving throw against your Volcanic Core feature also take {@damage 1d10} fire damage."
 			]
 		},
 		{
@@ -2109,7 +2108,7 @@
 			"level": 14,
 			"header": 2,
 			"entries": [
-				"Starting at 14th level, you learn how to channel the most deadly part of a volcanic eruption - pyroclastic surges.",
+				"Starting at 14th level, you learn how to channel the most deadly part of a volcanic eruption\u2014pyroclastic surges.",
 				"As an action, you can create a surge of super-heated gases and ash that moves forward in a 60 ft cone at rapid speed. Creatures in the surge must make a Dexterity saving throw against your spell save DC, taking {@dice 4d10} fire damage, {@dice 3d10} poison damage, and becoming {@condition blinded} on a failed saving throw. On a success, a creature takes half as much damage and isn't {@condition blinded}. The lesser restoration spell or similar magic can end the {@condition blinded} condition on a creature.",
 				"You can use this feature once, and regain the ability to do so when you finish a long rest."
 			]
@@ -2214,7 +2213,7 @@
 			"header": 2,
 			"entries": [
 				"Starting at 6th level, you can summon warriors to fight for you in battle. As an action, you can summon three soldiers who use the {@creature soldier|TheHarbinger} stat block in the opposite column. They appear as humanoid soldiers, though the specifics such as species, armor design, and the weapons they carry are up to you.",
-				"The soldiers move immediatley after you in initiative count, and follow your orders as long as you don't order them to do something directly harmful to themselves or each other. You can give them orders, collectivley or individually, as a bonus action. If you do not give an order to a specific soldier, they take the {@action Dodge} action. They will serve you for 1 minute or until they die, upon which time they disappear.",
+				"The soldiers move immediately after you in initiative count, and follow your orders as long as you don't order them to do something directly harmful to themselves or each other. You can give them orders, collectively or individually, as a bonus action. If you do not give an order to a specific soldier, they take the {@action Dodge} action. They will serve you for 1 minute or until they die, upon which time they disappear.",
 				"You can use this feature a number of times equal to your Wisdom modifier (minimum of once) and regain all expended uses on a long rest. You can only have one instance of this feature active at a time."
 			]
 		},
@@ -2671,6 +2670,40 @@
 			"source": "TheHarbinger",
 			"page": 5,
 			"shortName": "Astronomical",
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"eldritch blast#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"arms of hadar",
+							"magnify gravity|egw"
+						],
+						"3": [
+							"darkness",
+							"immovable object|egw"
+						],
+						"5": [
+							"clairvoyance",
+							"hunger of hadar"
+						],
+						"7": [
+							"gravity sinkhole|egw",
+							"shadow of moil|xge"
+						],
+						"9": [
+							"dawn|xge",
+							"planar binding"
+						],
+						"17": [
+							"ravenous void|egw"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Eldritch blast",
 				"arms of hadar",
@@ -2699,6 +2732,40 @@
 			"source": "TheHarbinger",
 			"page": 6,
 			"shortName": "Blizzard",
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"frostbite|XGE#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"armor of agathys",
+							"ice knife|XGE"
+						],
+						"3": [
+							"hold person",
+							"snilloc's snowball storm|XGE"
+						],
+						"5": [
+							"sleet storm",
+							"wind wall"
+						],
+						"7": [
+							"ice storm",
+							"otiluke's resilient sphere"
+						],
+						"9": [
+							"cone of cold",
+							"hold monster"
+						],
+						"17": [
+							"absolute zero|TheHarbinger"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"frostbite|xge",
 				"armor of agathys",
@@ -2727,6 +2794,40 @@
 			"source": "TheHarbinger",
 			"page": 7,
 			"shortName": "Disease",
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"chill touch#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"inflict wounds",
+							"ray of sickness"
+						],
+						"3": [
+							"crown of madness",
+							"ray of enfeeblement"
+						],
+						"5": [
+							"life transference|xge",
+							"vampiric touch"
+						],
+						"7": [
+							"blight",
+							"vitriolic sphere|xge"
+						],
+						"9": [
+							"cloudkill",
+							"contagion"
+						],
+						"17": [
+							"great malady|TheHarbinger"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"chill touch",
 				"inflict wounds",
@@ -2769,6 +2870,40 @@
 				"holy weapon|xge",
 				"power word kill"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"sacred flame#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"Guiding bolt",
+							"protection from evil and good"
+						],
+						"3": [
+							"spiritual weapon",
+							"zone of truth"
+						],
+						"5": [
+							"aura of vitality",
+							"spirit guardians"
+						],
+						"7": [
+							"banishment",
+							"guardian of faith"
+						],
+						"9": [
+							"dispel evil and good",
+							"holy weapon|xge"
+						],
+						"17": [
+							"power word kill"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Divine Focus|Harbinger|TheHarbinger|Divine|TheHarbinger|2",
 				"Divine Blast|Harbinger|TheHarbinger|Divine|TheHarbinger|6",
@@ -2797,6 +2932,40 @@
 				"destructive wave",
 				"meteor swarm"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"magic stone#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"catapult|xge",
+							"thunderwave"
+						],
+						"3": [
+							"flaming sphere",
+							"shatter"
+						],
+						"5": [
+							"conjure barrage",
+							"melf's minute meteors|xge"
+						],
+						"7": [
+							"staggering smite",
+							"stoneskin"
+						],
+						"9": [
+							"conjure volley",
+							"destructive wave"
+						],
+						"17": [
+							"meteor swarm"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Meteoric Focus|Harbinger|TheHarbinger|Meteoric|TheHarbinger|2",
 				"Hammering Assault|Harbinger|TheHarbinger|Meteoric|TheHarbinger|6",
@@ -2822,7 +2991,51 @@
 				"phantasmal killer",
 				"destructive wave",
 				"wall of stone",
-				"titanic growth|xge"
+				"titanic growth|TheHarbinger",
+				"hunter's mark"
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"booming blade|tce#c"
+						]
+					},
+					"innate": {
+						"2": {
+							"daily": {
+								"wis": [
+									"hunter's mark#1"
+								]
+							}
+						}
+					},
+					"prepared": {
+						"2": [
+							"bane",
+							"cause fear|xge"
+						],
+						"3": [
+							"dragon's breath|xge",
+							"enlarge/reduce"
+						],
+						"5": [
+							"erupting earth|xge",
+							"fear"
+						],
+						"7": [
+							"guardian of nature|xge",
+							"phantasmal killer"
+						],
+						"9": [
+							"destructive wave",
+							"wall of stone"
+						],
+						"17": [
+							"titanic growth|TheHarbinger"
+						]
+					}
+				}
 			],
 			"subclassFeatures": [
 				"Revelatory Beast Focus|Harbinger|TheHarbinger|Revelatory Beast|TheHarbinger|2",
@@ -2852,6 +3065,40 @@
 				"maelstrom|xge",
 				"hurricane|theharbinger"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"shape water|xge#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"witch bolt",
+							"zephyr strike|xge"
+						],
+						"3": [
+							"dust devil|xge",
+							"gust of wind"
+						],
+						"5": [
+							"lightning bolt",
+							"tidal wave|xge"
+						],
+						"7": [
+							"storm sphere|xge",
+							"watery sphere|xge"
+						],
+						"9": [
+							"control winds|xge",
+							"maelstrom|xge"
+						],
+						"17": [
+							"hurricane|TheHarbinger"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Storm Focus|Harbinger|TheHarbinger|Storm|TheHarbinger|2",
 				"Lightning Arc|Harbinger|TheHarbinger|Storm|TheHarbinger|6",
@@ -2880,6 +3127,40 @@
 				"temporal shunt|egw",
 				"time ravage|egw"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"toll the dead|xge#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"feather fall",
+							"gift of alacrity|egw"
+						],
+						"3": [
+							"hold person",
+							"pass without trace"
+						],
+						"5": [
+							"haste",
+							"slow"
+						],
+						"7": [
+							"divination",
+							"freedom of movement"
+						],
+						"9": [
+							"hold monster",
+							"temporal shunt|egw"
+						],
+						"17": [
+							"time ravage|egw"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Temporal Focus|Harbinger|TheHarbinger|Temporal|TheHarbinger|2",
 				"Rapid Spellcaster|Harbinger|TheHarbinger|Temporal|TheHarbinger|6",
@@ -2908,6 +3189,40 @@
 				"immolation|xge",
 				"ring of fire|theharbinger"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"create bonfire|xge#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"burning hands",
+							"searing smite"
+						],
+						"3": [
+							"aganazzar's scorcher|xge",
+							"scorching ray"
+						],
+						"5": [
+							"fireball",
+							"stinking cloud"
+						],
+						"7": [
+							"fire shield",
+							"wall of fire"
+						],
+						"9": [
+							"flame strike",
+							"immolation|xge"
+						],
+						"17": [
+							"ring of fire|TheHarbinger"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Volcanic Focus|Harbinger|TheHarbinger|Volcanic|TheHarbinger|2",
 				"Obsidian Shell|Harbinger|TheHarbinger|Volcanic|TheHarbinger|6",
@@ -2936,6 +3251,40 @@
 				"conjure volley",
 				"thousand war effort|theharbinger"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"sword burst|tce#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"Heroism",
+							"Shield"
+						],
+						"3": [
+							"cordon of arrows",
+							"find steed"
+						],
+						"5": [
+							"conjure barrage",
+							"enemies abound|xge"
+						],
+						"7": [
+							"find greater steed|xge",
+							"mordenkainen's faithful hound"
+						],
+						"9": [
+							"animate objects",
+							"conjure volley"
+						],
+						"17": [
+							"thousand war effort|TheHarbinger"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"War Focus|Harbinger|TheHarbinger|War|TheHarbinger|2",
 				"Call to Arms|Harbinger|TheHarbinger|War|TheHarbinger|6",
diff --git a/class/Chronicle of Heroes; The Weaveknight (v2.5).json b/class/Chronicle of Heroes; The Weaveknight (v2.5).json
index f7d99c3aa8..b15390eb23 100644
--- a/class/Chronicle of Heroes; The Weaveknight (v2.5).json	
+++ b/class/Chronicle of Heroes; The Weaveknight (v2.5).json	
@@ -821,6 +821,27 @@
 			"shortName": "Magus",
 			"className": "Weaveknight",
 			"classSource": "CoH-Weaveknight-v2-5",
+			"additionalSpells": [
+				{
+					"known": {
+						"3": [
+							"Heroism"
+						],
+						"5": [
+							"Mirror Image"
+						],
+						"9": [
+							"Blink"
+						],
+						"13": [
+							"Dimension Door"
+						],
+						"17": [
+							"Steel Wind Strike|xge"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Heroism",
 				"Mirror Image",
@@ -842,6 +863,27 @@
 			"shortName": "Spellwarden",
 			"className": "Weaveknight",
 			"classSource": "CoH-Weaveknight-v2-5",
+			"additionalSpells": [
+				{
+					"known": {
+						"3": [
+							"Protection from Evil and Good"
+						],
+						"5": [
+							"Aid"
+						],
+						"9": [
+							"Dispel Magic"
+						],
+						"13": [
+							"Death Ward"
+						],
+						"17": [
+							"Circle of Power"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Protection from Evil and Good",
 				"Aid",
@@ -863,6 +905,27 @@
 			"shortName": "Spellbow",
 			"className": "Weaveknight",
 			"classSource": "CoH-Weaveknight-v2-5",
+			"additionalSpells": [
+				{
+					"known": {
+						"3": [
+							"ray of sickness"
+						],
+						"5": [
+							"melf's acid arrow"
+						],
+						"9": [
+							"conjure barrage"
+						],
+						"13": [
+							"freedom of movement"
+						],
+						"17": [
+							"swift quiver"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Ray of Sickness",
 				"Melf's Acid Arrow",
@@ -884,6 +947,27 @@
 			"shortName": "Magehunter",
 			"className": "Weaveknight",
 			"classSource": "CoH-Weaveknight-v2-5",
+			"additionalSpells": [
+				{
+					"known": {
+						"3": [
+							"hunter's mark"
+						],
+						"5": [
+							"silence"
+						],
+						"9": [
+							"counterspell"
+						],
+						"13": [
+							"greater invisibility"
+						],
+						"17": [
+							"scrying"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Hunter's Mark",
 				"Silence",
@@ -905,6 +989,71 @@
 			"shortName": "Arcana Mystara",
 			"className": "Weaveknight",
 			"classSource": "CoH-Weaveknight-v2-5",
+			"additionalSpells": [
+				{
+					"known": {
+						"3": [
+							"comprehend languages",
+							{
+								"choose": "level=0;1",
+								"count": 1
+							}
+						],
+						"5": [
+							"nystul's magic aura",
+							{
+								"choose": "level=0;1;2",
+								"count": 1
+							}
+						],
+						"9": [
+							"tongues",
+							{
+								"choose": "level=0;1;2;3",
+								"count": 1
+							}
+						],
+						"13": [
+							"arcane eye",
+							{
+								"choose": "level=0;1;2;3;4",
+								"count": 1
+							}
+						],
+						"17": [
+							"legend lore",
+							{
+								"choose": "level=0;1;2;3;4;5",
+								"count": 1
+							}
+						]
+					},
+					"innate": {
+						"20": {
+							"daily": {
+								"1e": [
+									{
+										"choose": "level=6|class=wizard",
+										"count": 1
+									},
+									{
+										"choose": "level=7|class=wizard",
+										"count": 1
+									},
+									{
+										"choose": "level=8|class=wizard",
+										"count": 1
+									},
+									{
+										"choose": "level=9|class=wizard",
+										"count": 1
+									}
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassSpells": [
 				"Comprehend Languages",
 				"Nystul's Magic Aura",
@@ -926,6 +1075,27 @@
 			"shortName": "Godsbane",
 			"className": "Weaveknight",
 			"classSource": "CoH-Weaveknight-v2-5",
+			"additionalSpells": [
+				{
+					"known": {
+						"3": [
+							"bane"
+						],
+						"5": [
+							"phantasmal force"
+						],
+						"9": [
+							"fear"
+						],
+						"13": [
+							"banishment"
+						],
+						"17": [
+							"dispel evil and good"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Bane",
 				"Phantasmal Force",
@@ -1353,7 +1523,7 @@
 					"type": "list",
 					"items": [
 						"You have advantage on the attack roll.",
-						"The attack ignores half and three-quarters cover. In addition, a creature hit by the attack takes a -2 penalty to its AC until the start of its next turn.",
+						"The attack ignores half and three-quarters cover. In addition, a creature hit by the attack takes a \u22122 penalty to its AC until the start of its next turn.",
 						"When you roll damage for the attack, you can reroll a number of the damage dice up to your Intelligence modifier, but you must use the new rolls."
 					]
 				},
@@ -1954,6 +2124,19 @@
 			],
 			"entries": [
 				"You learn two cantrips of your choice from the {@filter wizard spell list|spells|level=0|class=wizard}. They count as weaveknight spells for you, and Intelligence is your spellcasting ability for them. Whenever you gain a level in this class, you can replace one of these cantrips with another cantrip from the wizard spell list."
+			],
+			"additionalSpells": [
+				{
+					"ability": "int",
+					"known": {
+						"_": [
+							{
+								"choose": "level=0|class=wizard",
+								"count": 2
+							}
+						]
+					}
+				}
 			]
 		},
 		{
diff --git a/class/DM_Havuhk; The Witch.json b/class/DM_Havuhk; The Witch.json
index c4489a23aa..694009606e 100644
--- a/class/DM_Havuhk; The Witch.json	
+++ b/class/DM_Havuhk; The Witch.json	
@@ -2174,6 +2174,32 @@
 			"source": "DMHavuhkWitch",
 			"page": 5,
 			"shortName": "Seers",
+			"additionalSpells": [
+				{
+					"prepared": {
+						"2": [
+							"Detect Magic",
+							"Identify"
+						],
+						"3": [
+							"Augury",
+							"Detect Thoughts"
+						],
+						"5": [
+							"Clairvoyance",
+							"Sending"
+						],
+						"7": [
+							"Arcane Eye",
+							"Divination"
+						],
+						"9": [
+							"Legend Lore",
+							"Scrying"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Detect Magic",
 				"Identify",
@@ -2187,7 +2213,7 @@
 				"Scrying"
 			],
 			"subclassFeatures": [
-				"Prediction|Witch|DMHavuhkWitch|Seers|DMHavuhkWitch|2",
+				"Coven of Seers|Witch|DMHavuhkWitch|Seers|DMHavuhkWitch|2",
 				"Mind's Eye|Witch|DMHavuhkWitch|Seers|DMHavuhkWitch|6",
 				"Pierce the Veil|Witch|DMHavuhkWitch|Seers|DMHavuhkWitch|10",
 				"Between the Lines|Witch|DMHavuhkWitch|Seers|DMHavuhkWitch|14",
@@ -2213,6 +2239,32 @@
 				"enervation|xge",
 				"negative energy flood|xge"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"2": [
+							"Cause Fear|xge",
+							"Hex"
+						],
+						"3": [
+							"Darkness",
+							"Ray of Enfeeblement"
+						],
+						"5": [
+							"Bestow Curse",
+							"Fear"
+						],
+						"7": [
+							"Blight",
+							"Phantasmal Killer"
+						],
+						"9": [
+							"enervation|xge",
+							"negative energy flood|xge"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Coven of Spite|Witch|DMHavuhkWitch|Spite|DMHavuhkWitch|2",
 				"Hexmaster|Witch|DMHavuhkWitch|Spite|DMHavuhkWitch|6",
@@ -2240,9 +2292,34 @@
 				"Commune with Nature",
 				"Insect Plague"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"2": [
+							"Entangle",
+							"Goodberry"
+						],
+						"3": [
+							"Locate Animals or Plants",
+							"Spike Growth"
+						],
+						"5": [
+							"Plant Growth",
+							"Speak with Plants"
+						],
+						"7": [
+							"Blight",
+							"Giant Insect"
+						],
+						"9": [
+							"Commune with Nature",
+							"Insect Plague"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
-				"Bonus Proficiency|Witch|DMHavuhkWitch|The Wyld|DMHavuhkWitch|2",
-				"Potion Brewing|Witch|DMHavuhkWitch|The Wyld|DMHavuhkWitch|2",
+				"Coven of the Wyld|Witch|DMHavuhkWitch|The Wyld|DMHavuhkWitch|2",
 				"One with Nature|Witch|DMHavuhkWitch|The Wyld|DMHavuhkWitch|6",
 				"Alchemical Knowledge|Witch|DMHavuhkWitch|The Wyld|DMHavuhkWitch|10",
 				"Budding Defence|Witch|DMHavuhkWitch|The Wyld|DMHavuhkWitch|14",
@@ -2268,9 +2345,43 @@
 				"Cone of Cold",
 				"steel wind strike|xge"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"2": [
+							"False Life",
+							"Ice Knife|xge"
+						],
+						"3": [
+							"Blur",
+							"Invisibility"
+						],
+						"5": [
+							"Blink",
+							"Spirit Guardians"
+						],
+						"7": [
+							"Banishment",
+							"Greater Invisibility"
+						],
+						"9": [
+							"Cone of Cold",
+							"steel wind strike|xge"
+						]
+					},
+					"innate": {
+						"10": {
+							"daily": {
+								"1": [
+									"speak with dead"
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassFeatures": [
-				"Bonus Proficiencies|Witch|DMHavuhkWitch|Spirits|DMHavuhkWitch|2",
-				"Ethereal Form|Witch|DMHavuhkWitch|Spirits|DMHavuhkWitch|2",
+				"Coven of Spirits|Witch|DMHavuhkWitch|Spirits|DMHavuhkWitch|2",
 				"Swift Strike|Witch|DMHavuhkWitch|Spirits|DMHavuhkWitch|6",
 				"Spirit Caller|Witch|DMHavuhkWitch|Spirits|DMHavuhkWitch|10",
 				"Death Walker|Witch|DMHavuhkWitch|Spirits|DMHavuhkWitch|14",
@@ -2296,8 +2407,34 @@
 				"Geas",
 				"Scrying"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"2": [
+							"Disguise Self",
+							"Ray of Sickness"
+						],
+						"3": [
+							"Alter Self",
+							"Invisibility"
+						],
+						"5": [
+							"Bestow Curse",
+							"Remove Curse"
+						],
+						"7": [
+							"Polymorph",
+							"Witch's Broom|dmhw"
+						],
+						"9": [
+							"Geas",
+							"Scrying"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
-				"Covenant of Three|Witch|DMHavuhkWitch|Crones|DMHavuhkWitch|2",
+				"Coven of Crones|Witch|DMHavuhkWitch|Crones|DMHavuhkWitch|2",
 				"Fey Protection|Witch|DMHavuhkWitch|Crones|DMHavuhkWitch|6",
 				"Hag's Eye|Witch|DMHavuhkWitch|Crones|DMHavuhkWitch|10",
 				"Bond of Magic|Witch|DMHavuhkWitch|Crones|DMHavuhkWitch|14",
@@ -2323,8 +2460,34 @@
 				"Modify Memory",
 				"Seeming"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"2": [
+							"Charm Person",
+							"Silent Image"
+						],
+						"3": [
+							"Enthrall",
+							"Moonbeam"
+						],
+						"5": [
+							"Enemies Abound|xge",
+							"Major Image"
+						],
+						"7": [
+							"Confusion",
+							"Greater Invisibility"
+						],
+						"9": [
+							"Modify Memory",
+							"Seeming"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
-				"Mantle of Moonlight|Witch|DMHavuhkWitch|The Moon|DMHavuhkWitch|2",
+				"Coven of the Moon|Witch|DMHavuhkWitch|The Moon|DMHavuhkWitch|2",
 				"Eye for Illusions|Witch|DMHavuhkWitch|The Moon|DMHavuhkWitch|6",
 				"Blessing of the Moon|Witch|DMHavuhkWitch|The Moon|DMHavuhkWitch|10",
 				"Shattered Reality|Witch|DMHavuhkWitch|The Moon|DMHavuhkWitch|14",
diff --git a/class/DXHHH101, Sinder, Superxavman; Sorcerer, Revitalized.json b/class/DXHHH101, Sinder, Superxavman; Sorcerer, Revitalized.json
index 62cccaca9c..311e1fcec2 100644
--- a/class/DXHHH101, Sinder, Superxavman; Sorcerer, Revitalized.json	
+++ b/class/DXHHH101, Sinder, Superxavman; Sorcerer, Revitalized.json	
@@ -1219,6 +1219,13 @@
 							"control winds|XGE",
 							"legend lore"
 						]
+					},
+					"expanded": {
+						"2": [
+							{
+								"all": "class=sorcerer;warlock;wizard|school=V;T|level=1;2;3;4;5"
+							}
+						]
 					}
 				}
 			],
@@ -1285,7 +1292,7 @@
 				"earthbind|xge",
 				"elemental bane|xge",
 				"enhance ability|phb",
-				"enlarge%2freduce|phb",
+				"enlarge/reduce|phb",
 				"erupting earth|xge",
 				"expeditious retreat|phb",
 				"fabricate|phb",
@@ -1358,6 +1365,13 @@
 							"negative energy flood|XGE",
 							"seeming"
 						]
+					},
+					"expanded": {
+						"2": [
+							{
+								"all": "class=sorcerer;warlock;wizard|school=I;N|level=1;2;3;4;5"
+							}
+						]
 					}
 				}
 			],
@@ -1452,6 +1466,13 @@
 							"control winds|XGE",
 							"maelstrom|XGE"
 						]
+					},
+					"expanded": {
+						"2": [
+							{
+								"all": "class=sorcerer;warlock;wizard|school=C;E|level=1;2;3;4;5"
+							}
+						]
 					}
 				}
 			],
@@ -1584,6 +1605,13 @@
 							"animate objects",
 							"mislead"
 						]
+					},
+					"expanded": {
+						"2": [
+							{
+								"all": "class=sorcerer;warlock;wizard|school=E;T|level=1;2;3;4;5"
+							}
+						]
 					}
 				}
 			],
diff --git a/class/DXHHH101; The Marksman.json b/class/DXHHH101; The Marksman.json
index 30b63c5a77..0027352668 100644
--- a/class/DXHHH101; The Marksman.json	
+++ b/class/DXHHH101; The Marksman.json	
@@ -730,7 +730,7 @@
 			"classSource": "DXMarksman",
 			"level": 5,
 			"entries": [
-				"Once per turn when you make a thrown weapon attack, you can cast a spell and infuse it into the weapon. The spell activates when it hits something, using the hit object or creature as the spell's target. If the spell affects mulitple creatures within its range, the projectile is considered the origin of the spell. If the spell targets a cone, the direction the weapon was travelling dictates the direction of the cone. If the spell requires a ranged spell attack, it instead forces the target to make a Dexterity saving throw, having no effect on a success. Spells still require concentration if necessary.",
+				"Once per turn when you make a thrown weapon attack, you can cast a spell and infuse it into the weapon. The spell activates when it hits something, using the hit object or creature as the spell's target. If the spell affects multiple creatures within its range, the projectile is considered the origin of the spell. If the spell targets a cone, the direction the weapon was travelling dictates the direction of the cone. If the spell requires a ranged spell attack, it instead forces the target to make a Dexterity saving throw, having no effect on a success. Spells still require concentration if necessary.",
 				"If a spell targets a number of creatures, including spells that do so when cast at a higher level, you can make multiple attacks using the same instance of the spell. After you use the Spell Slinger feature to cast the spell and attack a creature, you can use any additional attacks on your turn to add another creature to the spell. You can only target a number of creatures up to the spell's limit, and cannot target the same creature with the same instance of the spell. If a spell specifies that the chosen targets must be within a certain distance of each other, such as the slow spell, you can ignore that distance.",
 				"You are only able to infuse certain spells into your weapons, and as such can only infuse spells from the marksman spell list. If you gain the ability to cast spells via another class's Spellcasting or Pact Magic feature. You may cast any of your spells normally if the spell exists on that class's spell list."
 			]
@@ -979,6 +979,28 @@
 			"shortName": "Tactician",
 			"className": "Marksman",
 			"classSource": "DXMarksman",
+			"additionalSpells": [
+				{
+					"known": {
+						"6": [
+							"command",
+							"web"
+						],
+						"9": [
+							"haste",
+							"slow"
+						],
+						"13": [
+							"confusion",
+							"death ward"
+						],
+						"17": [
+							"circle of power",
+							"antilife shell"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Command",
 				"Web",
@@ -1005,6 +1027,28 @@
 			"shortName": "Arsonist",
 			"className": "Marksman",
 			"classSource": "DXMarksman",
+			"additionalSpells": [
+				{
+					"known": {
+						"6": [
+							"burning hands",
+							"heat metal"
+						],
+						"9": [
+							"fireball",
+							"hunger of hadar"
+						],
+						"13": [
+							"elemental bane|xge",
+							"wall of fire"
+						],
+						"17": [
+							"flame strike",
+							"immolation|xge"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"Burning Hands",
 				"Heat Metal",
@@ -1151,7 +1195,7 @@
 			"level": 15,
 			"header": 2,
 			"entries": [
-				"At 15th level, your command over the battlefield becomes so strong that you are able to alter your spells as to not hinder your allies. Whenever you cast a spell, you can define a number of creatures equal to your Intelligence modifer (minimum of 1). A chosen creature is immune to all effects of that spell except for damage.",
+				"At 15th level, your command over the battlefield becomes so strong that you are able to alter your spells as to not hinder your allies. Whenever you cast a spell, you can define a number of creatures equal to your Intelligence modifier (minimum of 1). A chosen creature is immune to all effects of that spell except for damage.",
 				"For example, the {@spell erupting earth|XGE} spell would still deal damage to a chosen creature, but would not become difficult terrain for them."
 			]
 		},
@@ -1306,7 +1350,20 @@
 			"entries": [
 				"You learn two cantrips of your choice from the {@filter marksman spell list|spells|class=marksman (DXM)}.",
 				"Your spellcasting ability for these spells is Intelligence. If the spell is also on the spell list of a class that you have the Spellcasting or Pact Magic feature from, you can use that class's spellcasting ability instead.",
-				"In addition, you can cast any spell you know from the marksman spell list as if you had the {@classFeature Spell Slinger|Marksman|DXMarksman|5|DXMarksman|} feature from the marksman class."
+				"In addition, you can cast any spell you know from the marksman spell list as if you had the {@classFeature Spell Slinger|Marksman|DXMarksman|5|DXMarksman} feature from the marksman class."
+			],
+			"additionalSpells": [
+				{
+					"ability": "int",
+					"known": {
+						"_": [
+							{
+								"choose": "class=marksman (DXM)",
+								"count": 2
+							}
+						]
+					}
+				}
 			]
 		}
 	],
diff --git a/class/Erikku Blade; Fate Weaver.json b/class/Erikku Blade; Fate Weaver.json
index 0a9e69447f..bae0460742 100644
--- a/class/Erikku Blade; Fate Weaver.json	
+++ b/class/Erikku Blade; Fate Weaver.json	
@@ -2772,7 +2772,7 @@
 			"level": 14,
 			"entries": [
 				"{@i 14th-level Euryale Feature}",
-				"You are immune to being petrified. In addition, as an action you can magically turn a creature cursed by your Gaze of the Cursed One feature. You cast the {@spell Flesh to Stone} spell without expending a spell slot even if you do not know the spell. ",
+				"You are immune to being petrified. In addition, as an action you can magically turn a creature cursed by your Gaze of the Cursed One feature. You cast the {@spell Flesh to Stone} spell without expending a spell slot even if you do not know the spell.",
 				"Once a creature is turned to stone from this boon, you cannot cast the spell again until you finish a long rest or you can expend a use of your Spell Weaving feature to regain the ability to cast the spell."
 			],
 			"page": 16,
@@ -2956,7 +2956,7 @@
 			"level": 18,
 			"entries": [
 				"{@i 18th-level Vizier Feature}",
-				"Whenever you cast a divination spell, such as Divination or Commune, that has a cumulative percent chance to give you either no answer, no reading, or a random reading, and your roll would determine one of those outcomes; you can choose to ignore that roll and gain the most honest and truthful reading anyways.",
+				"Whenever you cast a divination spell, such as {@spell Divination} or {@spell Commune}, that has a cumulative percent chance to give you either no answer, no reading, or a random reading, and your roll would determine one of those outcomes; you can choose to ignore that roll and gain the most honest and truthful reading anyways.",
 				"Once you do so you cannot do so again until you finish a long rest, and when you do so you have a guaranteed chance for that effect happening on your next casting of that spell, regardless if you have finished a long rest or not.",
 				"In addition, once as an action you can cast the Foresight spell regardless if you have the spell prepared or not. Doing so still spends the spell slot. When you cast the spell in this way, it only lasts for 1 minute instead of its normal duration. Once you do so you cannot do so again until you finish a long rest."
 			],
@@ -3123,7 +3123,7 @@
 							"polymorph"
 						],
 						"9": [
-							"farestep|XGE",
+							"far step|XGE",
 							"geas"
 						]
 					}
@@ -3149,11 +3149,15 @@
 			],
 			"additionalSpells": [
 				{
+					"known": {
+						"1": [
+							"produce flame#c"
+						]
+					},
 					"prepared": {
 						"1": [
 							"burning hands",
-							"hellish rebuke",
-							"produce flame#c"
+							"hellish rebuke"
 						],
 						"3": [
 							"continual flame",
@@ -3288,7 +3292,7 @@
 						],
 						"9": [
 							"hallow",
-							"negative energy flood"
+							"negative energy flood|XGE"
 						]
 					}
 				}
@@ -3374,8 +3378,8 @@
 							"aura of purity"
 						],
 						"9": [
-							"dawn",
-							"holy weapon"
+							"dawn|XGE",
+							"holy weapon|XGE"
 						]
 					}
 				}
@@ -3440,12 +3444,18 @@
 						],
 						"9": [
 							"dream",
-							"temporal shunt"
-						],
-						"18": [
-							"imprisonment",
-							"ravenous void|EGW"
+							"temporal shunt|EGW"
 						]
+					},
+					"innate": {
+						"18": {
+							"daily": {
+								"1e": [
+									"imprisonment",
+									"ravenous void|EGW"
+								]
+							}
+						}
 					}
 				}
 			],
@@ -3543,7 +3553,7 @@
 						],
 						"5": [
 							"counterspell",
-							"dispelmagic"
+							"dispel magic"
 						],
 						"7": [
 							"arcane eye",
@@ -3606,6 +3616,15 @@
 							"antilife shell",
 							"contagion"
 						]
+					},
+					"innate": {
+						"14": {
+							"daily": {
+								"1": [
+									"flesh to stone"
+								]
+							}
+						}
 					}
 				}
 			],
@@ -3639,11 +3658,15 @@
 			],
 			"additionalSpells": [
 				{
+					"known": {
+						"1": [
+							"guidance#c"
+						]
+					},
 					"prepared": {
 						"1": [
 							"gift of alacrity|EGW",
-							"identify",
-							"guidance#c"
+							"identify"
 						],
 						"3": [
 							"augury",
diff --git a/class/Fiddlestics; Cultivator.json b/class/Fiddlestics; Cultivator.json
index 2cc2af93b8..614ba78f57 100644
--- a/class/Fiddlestics; Cultivator.json	
+++ b/class/Fiddlestics; Cultivator.json	
@@ -979,6 +979,32 @@
 				"Winged Wildfire|Cultivator|CC|Falling Phoenix|CC|11",
 				"Phoenix Arisen|Cultivator|CC|Falling Phoenix|CC|15"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							"create bonfire|XGE#c"
+						]
+					},
+					"innate": {
+						"7": {
+							"resource": {
+								"3": [
+									"burning hands"
+								]
+							}
+						},
+						"11": {
+							"resource": {
+								"int": [
+									"feather fall"
+								]
+							}
+						}
+					},
+					"resourceName": "Ki"
+				}
+			],
 			"subclassSpells": [
 				"Create Bonfire|XGE",
 				"Burning Hands",
@@ -997,6 +1023,20 @@
 				"South Wind|Cultivator|CC|Four Winds|CC|11",
 				"East Winds|Cultivator|CC|Four Winds|CC|15"
 			],
+			"additionalSpells": [
+				{
+					"innate": {
+						"15": {
+							"resource": {
+								"1": [
+									"whirlwind|XGE"
+								]
+							}
+						}
+					},
+					"resourceName": "Ki"
+				}
+			],
 			"subclassSpells": [
 				"Whirlwind|XGE"
 			]
@@ -1013,6 +1053,56 @@
 				"Last Bastion|Cultivator|CC|Ki Fortress|CC|11",
 				"Destructive Shielding|Cultivator|CC|Ki Fortress|CC|15"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"3": [
+							"blade ward#c",
+							"true strike#c"
+						]
+					},
+					"innate": {
+						"s1": {
+							"resource": {
+								"1": [
+									"shield",
+									"shield of faith",
+									"tenser's floating disk"
+								]
+							}
+						},
+						"s2": {
+							"resource": {
+								"2": [
+									"immovable object|EGW",
+									"warding bond",
+									"warding wind|XGE"
+								]
+							}
+						},
+						"s3": {
+							"resource": {
+								"3": [
+									"intellect fortress|TCE",
+									"spirit guardians",
+									"wall of sand|XGE"
+								]
+							}
+						},
+						"s4": {
+							"resource": {
+								"4": [
+									"fire shield",
+									"stoneskin",
+									"wall of fire"
+								]
+							}
+						}
+					},
+					"resourceName": "Ki",
+					"ability": "int"
+				}
+			],
 			"subclassSpells": [
 				"Blade Ward",
 				"True Strike",
@@ -1043,6 +1133,26 @@
 				"Balance in Nature|Cultivator|CC|Taiji|CC|11",
 				"Wuji|Cultivator|CC|Taiji|CC|15"
 			],
+			"additionalSpells": [
+				{
+					"innate": {
+						"3": {
+							"rest": {
+								"2": [
+									"absorb elements|XGE"
+								]
+							}
+						},
+						"10": {
+							"rest": {
+								"3": [
+									"absorb elements|XGE"
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassSpells": [
 				"Absorb Elements|XGE"
 			]
diff --git a/class/Foxfire94; Astartes Inititate.json b/class/Foxfire94; Astartes Inititate.json
index b9ae8716aa..17536c554e 100644
--- a/class/Foxfire94; Astartes Inititate.json	
+++ b/class/Foxfire94; Astartes Inititate.json	
@@ -3072,8 +3072,8 @@
 					"type": "entries",
 					"name": "Transmutation",
 					"entries": [
-						"You add the polymorph spell to your spellbook, if it is not there already. You can cast polymorph without expending a spell slot. When you do so, you can target only yourself and transform into a beast whose challenge rating is 1 or lower.",
-						"Once you cast polymorph in this way, you can't do so again until you finish a short or long rest, though you can still cast it normally using an available spell slot."
+						"You add the {@spell polymorph} spell to your spellbook, if it is not there already. You can cast {@spell polymorph} without expending a spell slot. When you do so, you can target only yourself and transform into a beast whose challenge rating is 1 or lower.",
+						"Once you cast {@spell polymorph} in this way, you can't do so again until you finish a short or long rest, though you can still cast it normally using an available spell slot."
 					]
 				}
 			]
@@ -3224,7 +3224,7 @@
 			"level": 18,
 			"header": 2,
 			"entries": [
-				"Starting at 18th level when you score a critical hit with a melee attack you may attempt to cripple your foe. The creature must succeed a Constitution saving throw with a DC of 8 + your proficiency + your Strength modifier or be {@condition incapacitated}, have their movement speed reduced to 5 ft. and be knocked {@condition prone}. This effect remains until they are healed by a spell such as greater restoration."
+				"Starting at 18th level when you score a critical hit with a melee attack you may attempt to cripple your foe. The creature must succeed a Constitution saving throw with a DC of 8 + your proficiency + your Strength modifier or be {@condition incapacitated}, have their movement speed reduced to 5 ft. and be knocked {@condition prone}. This effect remains until they are healed by a spell such as {@spell greater restoration}."
 			]
 		},
 		{
@@ -4219,6 +4219,27 @@
 				{
 					"className": "Wizard",
 					"classSource": "PHB"
+				},
+				"polymorph"
+			],
+			"additionalSpells": [
+				{
+					"expanded": {
+						"13": [
+							{
+								"all": "class=Wizard"
+							}
+						]
+					},
+					"innate": {
+						"18": {
+							"rest": {
+								"1": [
+									"polymorph"
+								]
+							}
+						}
+					}
 				}
 			],
 			"subclassTableGroups": [
@@ -4505,6 +4526,22 @@
 		},
 		{
 			"name": "Sons of the Hydra",
+			"subclassSpells": [
+				"mirror image"
+			],
+			"additionalSpells": [
+				{
+					"innate": {
+						"15": {
+							"daily": {
+								"1": [
+									"mirror image"
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Sons of the Hydra|Astartes Inititate|FoxfireAstartesInitiate|Sons of the Hydra|FoxfireAstartesInitiate|1",
 				"The Many Heads of The Hydra|Astartes Inititate|FoxfireAstartesInitiate|Sons of the Hydra|FoxfireAstartesInitiate|1",
diff --git a/class/Foxfire94; Blood Hunter Re-Balanced.json b/class/Foxfire94; Blood Hunter Re-Balanced.json
index 702a8158c0..6175982739 100644
--- a/class/Foxfire94; Blood Hunter Re-Balanced.json	
+++ b/class/Foxfire94; Blood Hunter Re-Balanced.json	
@@ -3297,6 +3297,179 @@
 					"classSource": "PHB"
 				}
 			],
+			"additionalSpells": [
+				{
+					"name": "Archfey",
+					"expanded": {
+						"3": [
+							{
+								"all": "class=Warlock"
+							}
+						]
+					},
+					"innate": {
+						"7": {
+							"daily": {
+								"1": [
+									"slow"
+								]
+							}
+						}
+					}
+				},
+				{
+					"name": "Celestial",
+					"expanded": {
+						"3": [
+							{
+								"all": "class=Warlock"
+							}
+						]
+					},
+					"innate": {
+						"7": {
+							"daily": {
+								"1": [
+									"revivify"
+								]
+							}
+						}
+					}
+				},
+				{
+					"name": "Fathomless",
+					"expanded": {
+						"3": [
+							{
+								"all": "class=Warlock"
+							}
+						]
+					},
+					"innate": {
+						"7": {
+							"daily": {
+								"1": [
+									"lightning bolt"
+								]
+							}
+						}
+					}
+				},
+				{
+					"name": "Fiend",
+					"expanded": {
+						"3": [
+							{
+								"all": "class=Warlock"
+							}
+						]
+					},
+					"innate": {
+						"7": {
+							"daily": {
+								"1": [
+									"fireball"
+								]
+							}
+						}
+					}
+				},
+				{
+					"name": "Genie",
+					"expanded": {
+						"3": [
+							{
+								"all": "class=Warlock"
+							}
+						]
+					},
+					"innate": {
+						"7": {
+							"daily": {
+								"1": [
+									"protection from energy"
+								]
+							}
+						}
+					}
+				},
+				{
+					"name": "Great Old One",
+					"expanded": {
+						"3": [
+							{
+								"all": "class=Warlock"
+							}
+						]
+					},
+					"innate": {
+						"7": {
+							"daily": {
+								"1": [
+									"haste"
+								]
+							}
+						}
+					}
+				},
+				{
+					"name": "Hexblade",
+					"expanded": {
+						"3": [
+							{
+								"all": "class=Warlock"
+							}
+						]
+					},
+					"innate": {
+						"7": {
+							"daily": {
+								"1": [
+									"blink"
+								]
+							}
+						}
+					}
+				},
+				{
+					"name": "Undead",
+					"expanded": {
+						"3": [
+							{
+								"all": "class=Warlock"
+							}
+						]
+					},
+					"innate": {
+						"7": {
+							"daily": {
+								"1": [
+									"speak with dead"
+								]
+							}
+						}
+					}
+				},
+				{
+					"name": "Undying",
+					"expanded": {
+						"3": [
+							{
+								"all": "class=Warlock"
+							}
+						]
+					},
+					"innate": {
+						"7": {
+							"daily": {
+								"1": [
+									"bestow curse"
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassTableGroups": [
 				{
 					"subclasses": [
diff --git a/class/Foxfire94; Inquisitor.json b/class/Foxfire94; Inquisitor.json
index 259bf0cc0b..6ee72ab928 100644
--- a/class/Foxfire94; Inquisitor.json	
+++ b/class/Foxfire94; Inquisitor.json	
@@ -2162,7 +2162,7 @@
 			"level": 15,
 			"header": 2,
 			"entries": [
-				"Starting at 15th level you can expel a creature from the plane, even condeming the memory of them in those that remain. As an action you present your holy symbol and choose a creature you can see within 15 feet of you, they must make a Charisma saving throw against your spell save DC.",
+				"Starting at 15th level you can expel a creature from the plane, even condemning the memory of them in those that remain. As an action you present your holy symbol and choose a creature you can see within 15 feet of you, they must make a Charisma saving throw against your spell save DC.",
 				"If the creature fails the save, it is transported to a random location on the ethereal plane. A creature so transported must find its own way back to your current plane of existence. After 30 days of being on the ethereal plane all memory of the creature (except yours) begins to disappear with the creature being completely forgotten after 1 year; when the creature leaves the ethereal plane all memory of it returns to normal.",
 				"Once you use this feature you can't do so again until you finish a long rest."
 			]
@@ -2842,6 +2842,38 @@
 				"Unfaltering Determination|Inquisitor|FoxfireInquisitor|Daemon Hunter|FoxfireInquisitor|18",
 				"Forceful Smite Improvement|Inquisitor|FoxfireInquisitor|Daemon Hunter|FoxfireInquisitor|18"
 			],
+			"additionalSpells": [
+				{
+					"prepared": {
+						"2": [
+							"bless",
+							"ceremony|xge"
+						],
+						"5": [
+							"blur",
+							"nystul's magic aura"
+						],
+						"9": [
+							"beacon of hope",
+							"crusader's mantle"
+						],
+						"13": [
+							"aura of life",
+							"shadow of moil|xge"
+						],
+						"17": [
+							"dispel evil and good",
+							"wall of light|xge"
+						]
+					},
+					"known": {
+						"1": [
+							"sacred flame#c",
+							"word of radiance|xge#c"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"sacred flame",
 				"word of radiance|xge",
@@ -2875,6 +2907,38 @@
 				"Hexagrammic Wards|Inquisitor|FoxfireInquisitor|Witch Hunter|FoxfireInquisitor|18",
 				"Spell Disruption Improvement|Inquisitor|FoxfireInquisitor|Witch Hunter|FoxfireInquisitor|18"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							"control flames|xge#c",
+							"create bonfire|xge#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"absorb elements|xge",
+							"detect magic"
+						],
+						"5": [
+							"warding wind|xge",
+							"web"
+						],
+						"9": [
+							"dispel magic",
+							"hypnotic pattern"
+						],
+						"13": [
+							"aura of purity",
+							"otiluke's resilient sphere"
+						],
+						"17": [
+							"immolation|xge",
+							"synaptic static|xge"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"control flames|xge",
 				"create bonfire|xge",
@@ -2907,12 +2971,44 @@
 				"Predator's Knowledge Improvement|Inquisitor|FoxfireInquisitor|Monster Hunter|FoxfireInquisitor|15",
 				"Veteran of the Long Hunt|Inquisitor|FoxfireInquisitor|Monster Hunter|FoxfireInquisitor|18"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							"infestation|xge#c",
+							"poison spray#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"detect poison and disease",
+							"hunter's mark"
+						],
+						"5": [
+							"earthbind|XGE",
+							"locate animals or plants"
+						],
+						"9": [
+							"elemental weapon",
+							"major image"
+						],
+						"13": [
+							"dominate beast",
+							"polymorph"
+						],
+						"17": [
+							"commune with nature",
+							"hold monster"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"infestation|xge",
 				"poison spray",
 				"detect poison and disease",
 				"hunter's mark",
-				"earthbind",
+				"earthbind|XGE",
 				"locate animals or plants",
 				"elemental weapon",
 				"major image",
@@ -2939,6 +3035,38 @@
 				"Final Death|Inquisitor|FoxfireInquisitor|Grave Warden|FoxfireInquisitor|15",
 				"Positive Energy Burst|Inquisitor|FoxfireInquisitor|Grave Warden|FoxfireInquisitor|18"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							"chill touch#c",
+							"green-flame blade|tce#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"ceremony|xge",
+							"create or destroy water"
+						],
+						"5": [
+							"aid",
+							"gentle repose"
+						],
+						"9": [
+							"revivify",
+							"spirit shroud|tce"
+						],
+						"13": [
+							"aura of life",
+							"death ward"
+						],
+						"17": [
+							"dispel evil and good",
+							"hallow"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"chill touch",
 				"green-flame blade|tce",
@@ -2973,6 +3101,38 @@
 				"Superior Training|Inquisitor|FoxfireInquisitor|Overseer|FoxfireInquisitor|15",
 				"Compelled Compliance|Inquisitor|FoxfireInquisitor|Overseer|FoxfireInquisitor|18"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							"lightning lure|tce#c",
+							"prestidigitation#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"absorb impact|AdvancedArcaneries",
+							"jaden's duel detection|AdvancedArcaneries"
+						],
+						"5": [
+							"hammerhand|AdvancedArcaneries",
+							"knock"
+						],
+						"9": [
+							"flashbang|AdvancedArcaneries2",
+							"foreboding|AdvancedArcaneries"
+						],
+						"13": [
+							"endurance|AdvancedArcaneries",
+							"stone shape"
+						],
+						"17": [
+							"rary's telepathic bond",
+							"wall of stone"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"lightning lure|tce",
 				"prestidigitation",
@@ -3010,6 +3170,38 @@
 				"Eradicate Artifact|Inquisitor|FoxfireInquisitor|Iconoclast|FoxfireInquisitor|18",
 				"Profane Reliquary Improvement|Inquisitor|FoxfireInquisitor|Iconoclast|FoxfireInquisitor|18"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							"fire bolt#c",
+							"mind sliver|tce#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"kinetic taunt|AdvancedArcaneries2",
+							"objuration mechanicum|AdvancedArcaneries"
+						],
+						"5": [
+							"shatter",
+							"tasha's mind whip|TCE"
+						],
+						"9": [
+							"intellect fortress|TCE",
+							"siphon magic|AdvancedArcaneries2"
+						],
+						"13": [
+							"denial of divinity|FoxfireInquisitor",
+							"elemental bane|XGE"
+						],
+						"17": [
+							"delirium|AdvancedArcaneries2",
+							"mind war|AdvancedArcaneries2"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"fire bolt",
 				"mind sliver|tce",
@@ -3046,6 +3238,38 @@
 				"Shared Judgement Improvement|Inquisitor|FoxfireInquisitor|Vigilant|FoxfireInquisitor|18",
 				"Combat Tactics Improvement|Inquisitor|FoxfireInquisitor|Vigilant|FoxfireInquisitor|18"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							"shocking grasp#c",
+							"spare the dying#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"cure wounds",
+							"shield of faith"
+						],
+						"5": [
+							"lesser restoration",
+							"prayer of healing"
+						],
+						"9": [
+							"catnap|XGE",
+							"sacred mercy|FoxfireInquisitor"
+						],
+						"13": [
+							"guardian of faith",
+							"telekine dome|AdvancedArcaneries"
+						],
+						"17": [
+							"greater restoration",
+							"mass cure wounds"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"shocking grasp",
 				"spare the dying",
@@ -3080,6 +3304,38 @@
 				"Undead Puppetry|Inquisitor|FoxfireInquisitor|Hereticus|FoxfireInquisitor|15",
 				"Awakened Daemonic Weapon|Inquisitor|FoxfireInquisitor|Hereticus|FoxfireInquisitor|18"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							"warp lightning|FoxfireInquisitor#c",
+							"wrack|FoxfireInquisitor#c"
+						]
+					},
+					"prepared": {
+						"2": [
+							"chaos bolt|XGE",
+							"soulblaze|AdvancedArcaneries"
+						],
+						"5": [
+							"infernal claws|AdvancedArcaneries2",
+							"infernal gaze|AdvancedArcaneries"
+						],
+						"9": [
+							"elemental horror|AdvancedArcaneries2",
+							"mind howl|AdvancedArcaneries"
+						],
+						"13": [
+							"sensory overload|AdvancedArcaneries2",
+							"spontaneous combustion|AdvancedArcaneries"
+						],
+						"17": [
+							"baleful devolution|AdvancedArcaneries2",
+							"haemorrhage|AdvancedArcaneries"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"warp lightning|FoxfireInquisitor",
 				"wrack|FoxfireInquisitor",
diff --git a/class/Foxfire94; Lycanthrope.json b/class/Foxfire94; Lycanthrope.json
index 1b86cf7659..e7b7cd87bb 100644
--- a/class/Foxfire94; Lycanthrope.json	
+++ b/class/Foxfire94; Lycanthrope.json	
@@ -3419,10 +3419,7 @@
 					"expanded": {
 						"6": [
 							{
-								"all": "level=0|class=Druid"
-							},
-							{
-								"all": "level=1|class=Druid"
+								"all": "level=0;1|class=Druid"
 							},
 							{
 								"all": "level=1|class=Ranger"
diff --git a/class/Fragsauce; Soul Binder Redux.json b/class/Fragsauce; Soul Binder Redux.json
index 7cd00994ba..40de825f93 100644
--- a/class/Fragsauce; Soul Binder Redux.json	
+++ b/class/Fragsauce; Soul Binder Redux.json	
@@ -1064,6 +1064,19 @@
 				"Nature's Commands|Soul Binder|FragSauceSBR|Wilds|FragSauceSBR|11",
 				"Alpha Call|Soul Binder|FragSauceSBR|Wilds|FragSauceSBR|15"
 			],
+			"additionalSpells": [
+				{
+					"innate": {
+						"15": {
+							"daily": {
+								"1": [
+									"summon beast|tce"
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassSpells": [
 				"summon beast|tce"
 			]
@@ -1074,6 +1087,32 @@
 			"className": "Soul Binder",
 			"classSource": "FragSauceSBR",
 			"shortName": "Unknown",
+			"additionalSpells": [
+				{
+					"prepared": {
+						"s1": [
+							"cause fear|xge",
+							"dissonant whispers"
+						],
+						"s2": [
+							"detect thoughts",
+							"crown of madness"
+						],
+						"s3": [
+							"fear",
+							"enemies abound|xge"
+						],
+						"s4": [
+							"confusion",
+							"phantasmal killer"
+						],
+						"s5": [
+							"dominate person",
+							"rary's telepathic bond"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"cause fear|xge",
 				"dissonant whispers",
@@ -1114,6 +1153,32 @@
 			"className": "Soul Binder",
 			"classSource": "FragSauceSBR",
 			"shortName": "Merged",
+			"additionalSpells": [
+				{
+					"prepared": {
+						"s1": [
+							"arms of hadar",
+							"entangle"
+						],
+						"s2": [
+							"adaptation|FragSauceSBR",
+							"alter self"
+						],
+						"s3": [
+							"gaseous form",
+							"protection from energy"
+						],
+						"s4": [
+							"evard's black tentacles",
+							"freedom of movement"
+						],
+						"s5": [
+							"contagion",
+							"enervation|xge"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"arms of hadar",
 				"entangle",
@@ -1155,6 +1220,32 @@
 			"className": "Soul Binder",
 			"classSource": "FragSauceSBR",
 			"shortName": "Spirit Vessel",
+			"additionalSpells": [
+				{
+					"prepared": {
+						"s1": [
+							"false life",
+							"unseen servant"
+						],
+						"s2": [
+							"silence",
+							"invisibility"
+						],
+						"s3": [
+							"life transference|xge",
+							"vampiric touch"
+						],
+						"s4": [
+							"shadow of moil|xge",
+							"death ward"
+						],
+						"s5": [
+							"negative energy flood|xge",
+							"raise dead"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"false life",
 				"unseen servant",
@@ -1181,6 +1272,32 @@
 			"className": "Soul Binder",
 			"classSource": "FragSauceSBR",
 			"shortName": "Puppet",
+			"additionalSpells": [
+				{
+					"prepared": {
+						"s1": [
+							"alarm",
+							"unseen servant"
+						],
+						"s2": [
+							"hold person",
+							"phantasmal force"
+						],
+						"s3": [
+							"enemies abound|xge",
+							"tiny servant|xge"
+						],
+						"s4": [
+							"compulsion",
+							"freedom of movement"
+						],
+						"s5": [
+							"animate objects",
+							"dominate person"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"alarm",
 				"unseen servant",
@@ -1207,6 +1324,15 @@
 			"className": "Soul Binder",
 			"classSource": "FragSauceSBR",
 			"shortName": "Divine",
+			"additionalSpells": [
+				{
+					"prepared": {
+						"7": [
+							"healing word"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"healing word"
 			],
@@ -1566,7 +1692,7 @@
 			"level": 15,
 			"header": 2,
 			"entries": [
-				"When you reach 15th you can choose to let willingly go of your sanity in order to give your companion magnificicant powers.",
+				"When you reach 15th you can choose to let willingly go of your sanity in order to give your companion magnificent powers.",
 				"As a bonus action you can roll on the Madness table from the Edge of Sanity feature and suffer that effect for 1 minute. During that minute your companion can use the features from the Edge of Sanity feature as much as it wants to.",
 				"Once you have used this feature you must finish a long rest before you can do so again."
 			]
@@ -1816,7 +1942,7 @@
 						],
 						[
 							"2nd",
-							"{@spell adaptation|SBR}, {@spell alter self}"
+							"{@spell adaptation|FragSauceSBR}, {@spell alter self}"
 						],
 						[
 							"3rd",
@@ -1980,7 +2106,7 @@
 					"items": [
 						"While you are merged you can see through your companion's eyes.",
 						"You can now take the {@action Cast a Spell} action while morphed. When you do so, you cast the spell through your companion and it must use its reaction to deliver the spell.",
-						"As a reaction you can add your Charisma modifier to the result of a saving throw your companion makas (after it rolls but before you know if it fails) or you can add it to your companion's AC against one attack (after you know the result of the attack roll)."
+						"As a reaction you can add your Charisma modifier to the result of a saving throw your companion makes (after it rolls but before you know if it fails) or you can add it to your companion's AC against one attack (after you know the result of the attack roll)."
 					]
 				}
 			]
diff --git a/class/High Lord Amaram; Witcher Class.json b/class/High Lord Amaram; Witcher Class.json
index 655c5347b6..0cbc1b2192 100644
--- a/class/High Lord Amaram; Witcher Class.json	
+++ b/class/High Lord Amaram; Witcher Class.json	
@@ -4679,7 +4679,7 @@
 					"name": "Spell Slots",
 					"type": "entries",
 					"entries": [
-						"The Witcher table shows how many spell slots you have to cast your Witcher spells. To cast one of these Witcher spells , you must expend a slot of the spell's level or higher. You can learn additional Witcher spells of your choice at higher levels, as shown in the Witcher table. You regain all expended sp ell slots when you finish a Long Rest.",
+						"The Witcher table shows how many spell slots you have to cast your Witcher spells. To cast one of these Witcher spells, you must expend a slot of the spell's level or higher. You can learn additional Witcher spells of your choice at higher levels, as shown in the Witcher table. You regain all expended spell slots when you finish a Long Rest.",
 						"For example, if you know the 1st-level spell {@spell Aard|WITCHERHLA} and have a 1st-level and a 2nd-level spell slot available, you can cast {@spell Aard|WITCHERHLA} using either slot."
 					]
 				},
@@ -4699,11 +4699,17 @@
 						"Intelligence is your spellcasting ability for your witcher spells, since the power of your spellcasting came through rigorous study and practice. You use your Intelligence whenever a spell refers to your spellcasting ability. In addition, you use your Intelligence modifier when setting the saving throw DC for a Witcher spell you cast and when making an attack roll with one.",
 						"{@b Saving throws:} Some spells require a saving throw to resist its effect. The saving throw DC is calculated as follows:",
 						{
-							"type": "list",
-							"style": "list-no-bullets",
-							"items": [
-								"{@b Spell Save DC} = 8 + your proficiency bonus + your Intelligence modifier",
-								"{@b Spell Attack Modifier} = your proficiency bonus + your Intelligence modifier"
+							"type": "abilityDc",
+							"name": "Spell",
+							"attributes": [
+								"int"
+							]
+						},
+						{
+							"type": "abilityAttackMod",
+							"name": "Spell",
+							"attributes": [
+								"int"
 							]
 						}
 					]
@@ -5151,6 +5157,23 @@
 				"Martial Spellcasting|Witcher|WITCHERHLA|School of the Griffin|WITCHERHLA|14",
 				"Dual Casting|Witcher|WITCHERHLA|School of the Griffin|WITCHERHLA|18"
 			],
+			"additionalSpells": [
+				{
+					"expanded": {
+						"1": [
+							"charm Person|phb",
+							"firestream|WITCHERHLA",
+							"sleep|phb",
+							"sweep|WITCHERHLA",
+							"blindness/deafness|phb",
+							"chains|WITCHERHLA",
+							"guardian|WITCHERHLA",
+							"rimefrost|WITCHERHLA",
+							"retribution|WITCHERHLA"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"charm Person|phb",
 				"firestream|WITCHERHLA",
@@ -5587,7 +5610,7 @@
 			"level": 6,
 			"header": 2,
 			"entries": [
-				"Beginning at 6th level, you learn alternative forms of casting for the spells you know. For example, if you already know the spell {@spell Igni|WITCHERHLA}, you automatically learn the spell {@spell Firestream|WITCHERHLA} as well. If you know the spell  {@spell Heliotrope|WITCHERHLA}, you will automatically learn the spell  {@spell Guardian|WITCHERHLA} once you reach the level at which you can learn the spell. These alternative spells do not count against the number of spells you know. Reference the {@i Witcher Spellcasting} list for more information."
+				"Beginning at 6th level, you learn alternative forms of casting for the spells you know. For example, if you already know the spell {@spell Igni|WITCHERHLA}, you automatically learn the spell {@spell Firestream|WITCHERHLA} as well. If you know the spell  {@spell Heliotrope|WITCHERHLA}, you will automatically learn the spell {@spell Guardian|WITCHERHLA} once you reach the level at which you can learn the spell. These alternative spells do not count against the number of spells you know. Reference the {@i Witcher Spellcasting} list for more information."
 			]
 		},
 		{
diff --git a/class/J.R. Raffles; The Ghost.json b/class/J.R. Raffles; The Ghost.json
index 3cb8598050..af5fe06662 100644
--- a/class/J.R. Raffles; The Ghost.json	
+++ b/class/J.R. Raffles; The Ghost.json	
@@ -270,6 +270,36 @@
 				"destructive wave|phb",
 				"greater restoration|phb"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"1": [
+							"thaumaturgy|PHB#c"
+						]
+					},
+					"innate": {
+						"2": {
+							"rest": {
+								"1": [
+									"augury|PHB#2"
+								]
+							}
+						},
+						"10": {
+							"will": [
+								"Rary's telepathic bond|PHB#5"
+							]
+						},
+						"20": {
+							"daily": {
+								"1": [
+									"wish|PHB"
+								]
+							}
+						}
+					}
+				}
+			],
 			"classFeatures": [
 				"Spirit Form|Ghost|JRRTG|1",
 				"Possession|Ghost|JRRTG|1",
@@ -474,7 +504,18 @@
 				"Shepherd Of The Lost Souls|Occultist (Ghost Variant)|JRRTG|20"
 			],
 			"subclassTitle": "Occultist (Ghost Variant)",
-			"hasFluff": true
+			"hasFluff": true,
+			"additionalSpells": [
+				{
+					"innate": {
+						"10": {
+							"will": [
+								"Rary's telepathic bond|PHB#5"
+							]
+						}
+					}
+				}
+			]
 		}
 	],
 	"classFeature": [
@@ -781,7 +822,7 @@
 			"classSource": "JRRTG",
 			"level": 10,
 			"entries": [
-				"Just as you project your spirit body from host to host on the Material Plane, you've learned to cast a {@spell web|PHB} in the Border Ethereal, serving as a conduit between allies near and far.",
+				"Just as you project your spirit body from host to host on the Material Plane, you've learned to cast a web in the Border Ethereal, serving as a conduit between allies near and far.",
 				"As of 10th level you can cast {@spell Rary's telepathic bond|PHB} at will, requiring no components. Creatures connected in this way have advantage on saving throws to resist being {@condition charmed|PHB} or {@condition frightened|PHB}."
 			]
 		},
@@ -1090,6 +1131,13 @@
 								"count": 1
 							}
 						]
+					},
+					"innate": {
+						"11": {
+							"will": [
+								"protection from evil and good|PHB"
+							]
+						}
 					}
 				}
 			],
@@ -1121,10 +1169,45 @@
 			"className": "Ghost",
 			"classSource": "JRRTG",
 			"page": 8,
+			"additionalSpells": [
+				{
+					"innate": {
+						"1": {
+							"will": [
+								"catapult|xge",
+								"mage hand|PHB#c"
+							]
+						},
+						"6": {
+							"rest": {
+								"1": [
+									"animate objects|phb"
+								]
+							}
+						},
+						"11": {
+							"will": [
+								"phantasmal force|PHB",
+								"detect thoughts|PHB"
+							]
+						},
+						"17": {
+							"rest": {
+								"1": [
+									"telekinesis|PHB"
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassSpells": [
 				"catapult|xge",
 				"mage hand|phb",
-				"animate objects|phb"
+				"animate objects|phb",
+				"telekinesis|phb",
+				"phantasmal force|PHB",
+				"detect thoughts|PHB"
 			],
 			"subclassFeatures": [
 				"Mischief Not Managed|Ghost|JRRTG|Mischief Not Managed|JRRTG|1",
@@ -1141,6 +1224,19 @@
 			"className": "Ghost",
 			"classSource": "JRRTG",
 			"page": 9,
+			"additionalSpells": [
+				{
+					"innate": {
+						"11": {
+							"daily": {
+								"1": [
+									"Tenser's transformation|XGE#6"
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassSpells": [
 				"tenser's transformation|xge"
 			],
@@ -1448,9 +1544,9 @@
 				{
 					"type": "list",
 					"items": [
-						"{@i Delude}: You can cast phantasmal force, requiring no components. When cast in this way, the spell targets only your host, and ends early if the possession ends. You can't use Delude again before the possession ends.",
+						"{@i Delude}: You can cast {@spell phantasmal force}, requiring no components. When cast in this way, the spell targets only your host, and ends early if the possession ends. You can't use Delude again before the possession ends.",
 						"{@i The Gibbering}: As an action, you force your host to make a Constitution saving throw. If they fail, they lose their concentration on spells, and can speak only in gibberish until the start of your next turn.",
-						"{@i Steal Thoughts}: You can cast detect thoughts, requiring no components. When cast in this way, the spell detects only your host, and ends early if the possession ends."
+						"{@i Steal Thoughts}: You can cast {@spell detect thoughts}, requiring no components. When cast in this way, the spell detects only your host, and ends early if the possession ends."
 					]
 				},
 				"An unsuspecting host can use its action to repeat the Insight check, deducing your presence on a success. The host becomes aware of you automatically if you force them to make a saving throw. An unwilling host that learns of your presence can use its action to make a Charisma save. If it succeeds, the possession ends. The possession also ends if the host travels to a different plane of existence, leaving you behind.",
@@ -1468,7 +1564,7 @@
 			"level": 17,
 			"entries": [
 				"Starting at 17th level, whenever you roll for initiative, if your {@subclassFeature Dance Of The Departed|Ghost|JRRTG|Mischief Not Managed|JRRTG|6} feature has been expended, you immediately regain its use.",
-				"Additionally, you can cast telekinesis, requiring no components. Once you cast the spell in this way, you must finish a short or long rest before you can do so again."
+				"Additionally, you can cast {@spell telekinesis}, requiring no components. Once you cast the spell in this way, you must finish a short or long rest before you can do so again."
 			]
 		},
 		{
diff --git a/class/Jonoman3000; Planeshifter.json b/class/Jonoman3000; Planeshifter.json
index c90624a47d..7a74f2bead 100644
--- a/class/Jonoman3000; Planeshifter.json	
+++ b/class/Jonoman3000; Planeshifter.json	
@@ -82,7 +82,12 @@
 						"a": [
 							"longbow|phb"
 						],
-						"b": []
+						"b": [
+							{
+								"equipmentType": "weaponSimple",
+								"quantity": 2
+							}
+						]
 					},
 					{
 						"a": [
@@ -93,7 +98,13 @@
 						]
 					},
 					{
-						"_": []
+						"_": [
+							"longsword|PHB",
+							{
+								"item": "dagger|PHB",
+								"quantity": 2
+							}
+						]
 					}
 				]
 			},
@@ -423,6 +434,24 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"zone of truth|phb"
+						],
+						"9": [
+							"daylight|phb"
+						],
+						"13": [
+							"death ward|phb"
+						],
+						"17": [
+							"commune|phb"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -476,6 +505,20 @@
 							"beast bond|phb",
 							"speak with animals|phb"
 						]
+					},
+					"known": {
+						"5": [
+							"animal messenger|phb"
+						],
+						"9": [
+							"conjure animals|phb"
+						],
+						"13": [
+							"dominate beast|phb"
+						],
+						"17": [
+							"awaken|phb"
+						]
 					}
 				}
 			]
@@ -529,6 +572,24 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"pass without trace|phb"
+						],
+						"9": [
+							"speak with plants|phb"
+						],
+						"13": [
+							"conjure woodland beings|phb"
+						],
+						"17": [
+							"commune with nature|phb"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -574,6 +635,24 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"magic weapon|phb"
+						],
+						"9": [
+							"spirit guardians|phb"
+						],
+						"13": [
+							"guardian of faith|phb"
+						],
+						"17": [
+							"raise dead|phb"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -620,6 +699,27 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"detect thoughts|phb"
+						],
+						"9": [
+							"tongues|phb"
+						],
+						"13": [
+							"confusion|phb"
+						],
+						"17": [
+							"seeming|phb"
+						],
+						"_": [
+							"mage hand|PHB#c"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -672,6 +772,20 @@
 						"_": [
 							"silent image|phb"
 						]
+					},
+					"known": {
+						"5": [
+							"crown of madness|phb"
+						],
+						"9": [
+							"hypnotic pattern|phb"
+						],
+						"13": [
+							"Evard's black tentacles|phb"
+						],
+						"17": [
+							"modify memory|phb"
+						]
 					}
 				}
 			]
@@ -727,6 +841,20 @@
 							"detect magic|phb",
 							"detect poison and disease|phb"
 						]
+					},
+					"known": {
+						"5": [
+							"protection from poison|phb"
+						],
+						"9": [
+							"stinking cloud|phb"
+						],
+						"13": [
+							"dimension door|phb"
+						],
+						"17": [
+							"cloudkill|phb"
+						]
 					}
 				}
 			]
@@ -780,6 +908,24 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"hold person|phb"
+						],
+						"9": [
+							"magic circle|phb"
+						],
+						"13": [
+							"Otiluke's resilient sphere|phb"
+						],
+						"17": [
+							"planar binding|phb"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -825,6 +971,24 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"phantasmal force|phb"
+						],
+						"9": [
+							"animate dead|phb"
+						],
+						"13": [
+							"blight|phb"
+						],
+						"17": [
+							"antilife shell|phb"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -877,6 +1041,20 @@
 						"_": [
 							"disguise self|phb"
 						]
+					},
+					"known": {
+						"5": [
+							"alter self|phb"
+						],
+						"9": [
+							"dispel magic|phb"
+						],
+						"13": [
+							"dimension door|phb"
+						],
+						"17": [
+							"dispel evil and good|phb"
+						]
 					}
 				}
 			]
@@ -924,6 +1102,24 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"darkness|phb"
+						],
+						"9": [
+							"bestow curse|phb"
+						],
+						"13": [
+							"banishment|phb"
+						],
+						"17": [
+							"banishing smite|phb"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -975,6 +1171,24 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"enhance ability|phb"
+						],
+						"9": [
+							"elemental weapon|phb"
+						],
+						"13": [
+							"elemental bane|xge"
+						],
+						"17": [
+							"geas|phb"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -1020,6 +1234,24 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"heat metal|phb"
+						],
+						"9": [
+							"slow|phb"
+						],
+						"13": [
+							"compulsion|phb"
+						],
+						"17": [
+							"animate objects|phb"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -1066,6 +1298,27 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"calm emotions|phb"
+						],
+						"9": [
+							"sending|phb"
+						],
+						"13": [
+							"Mordenkainen's private sanctum|phb"
+						],
+						"17": [
+							"hallow|phb"
+						],
+						"_": [
+							"friends|PHB#c"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -1117,6 +1370,24 @@
 						]
 					]
 				}
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"5": [
+							"find steed|phb"
+						],
+						"9": [
+							"crusader's mantle|phb"
+						],
+						"13": [
+							"aura of purity|phb"
+						],
+						"17": [
+							"circle of power|phb"
+						]
+					}
+				}
 			]
 		},
 		{
@@ -1168,9 +1439,24 @@
 				{
 					"innate": {
 						"_": [
+							"mending|PHB#c",
 							"unseen servant|phb",
 							"tenser's floating disk|phb"
 						]
+					},
+					"known": {
+						"5": [
+							"mirror image|phb"
+						],
+						"9": [
+							"clairvoyance|phb"
+						],
+						"13": [
+							"arcane eye|phb"
+						],
+						"17": [
+							"mislead|phb"
+						]
 					}
 				}
 			]
@@ -2846,6 +3132,32 @@
 				"watery sphere|xge",
 				"maelstrom|xge"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"fog cloud|phb",
+							"create or destroy water|phb"
+						],
+						"5": [
+							"grasping pool|JonomanPlaneshifter",
+							"water whips|JonomanPlaneshifter"
+						],
+						"9": [
+							"wall of water|xge",
+							"water breathing|phb"
+						],
+						"13": [
+							"control water|phb",
+							"watery sphere|xge"
+						],
+						"17": [
+							"geyser|JonomanPlaneshifter",
+							"maelstrom|xge"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Hall of the Maelstrom|Planeshifter|JonomanPlaneshifter|Maelstrom|JonomanPlaneshifter|1",
 				"One with the Maelstrom Improvement|Planeshifter|JonomanPlaneshifter|Maelstrom|JonomanPlaneshifter|3",
@@ -2874,6 +3186,32 @@
 				"flame strike",
 				"immolation|xge"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"burning hands|phb",
+							"hellish rebuke|phb"
+						],
+						"5": [
+							"flaming sphere|phb",
+							"scorching ray|phb"
+						],
+						"9": [
+							"fireball|phb",
+							"melf's minute meteors|xge"
+						],
+						"13": [
+							"fire shield|phb",
+							"wall of fire|phb"
+						],
+						"17": [
+							"flame strike|phb",
+							"immolation|xge"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Hall of the Inferno|Planeshifter|JonomanPlaneshifter|Inferno|JonomanPlaneshifter|1",
 				"One with the Inferno Improvement|Planeshifter|JonomanPlaneshifter|Inferno|JonomanPlaneshifter|3",
@@ -2901,6 +3239,32 @@
 				"transmute rock|xge",
 				"wall of stone"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"absorb elements|xge",
+							"earth tremor|xge"
+						],
+						"5": [
+							"earth dome|JonomanPlaneshifter",
+							"maximilian's earthen grasp|xge"
+						],
+						"9": [
+							"erupting earth|xge",
+							"meld into stone|phb"
+						],
+						"13": [
+							"stone shape|phb",
+							"stoneskin|phb"
+						],
+						"17": [
+							"transmute rock|xge",
+							"wall of stone|phb"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Hall of the Earth|Planeshifter|JonomanPlaneshifter|Earth|JonomanPlaneshifter|1",
 				"One with the Earth Improvement|Planeshifter|JonomanPlaneshifter|Earth|JonomanPlaneshifter|3",
@@ -2927,6 +3291,32 @@
 				"freedom of movement",
 				"control winds|xge"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"feather fall|phb",
+							"longstrider|phb"
+						],
+						"5": [
+							"gust of wind|phb",
+							"levitate|phb"
+						],
+						"9": [
+							"fly|phb",
+							"wind wall|phb"
+						],
+						"13": [
+							"cloud form|JonomanPlaneshifter",
+							"freedom of movement|phb"
+						],
+						"17": [
+							"control winds|xge",
+							"rushing wind|JonomanPlaneshifter"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Hall of the Sky|Planeshifter|JonomanPlaneshifter|Sky|JonomanPlaneshifter|1",
 				"One with the Sky Improvement|Planeshifter|JonomanPlaneshifter|Sky|JonomanPlaneshifter|3",
@@ -2955,6 +3345,32 @@
 				"contagion",
 				"insect plague"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"bane|phb",
+							"ray of sickness|phb"
+						],
+						"5": [
+							"blindness/deafness|phb",
+							"ray of enfeeblement|phb"
+						],
+						"9": [
+							"enemies abound|xge",
+							"fear|phb"
+						],
+						"13": [
+							"phantasmal killer|phb",
+							"sickening radiance|xge"
+						],
+						"17": [
+							"contagion|phb",
+							"insect plague|phb"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Hall of the Shadowfell|Planeshifter|JonomanPlaneshifter|Shadowfell|JonomanPlaneshifter|1",
 				"One with the Shadowfell Improvement|Planeshifter|JonomanPlaneshifter|Shadowfell|JonomanPlaneshifter|3",
@@ -2983,6 +3399,32 @@
 				"dominate person",
 				"dream"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"2": [
+							"charm person|phb",
+							"faerie fire|phb"
+						],
+						"5": [
+							"invisibility|phb",
+							"misty step|phb"
+						],
+						"9": [
+							"counterspell|phb",
+							"major image|phb"
+						],
+						"13": [
+							"hallucinatory terrain|phb",
+							"greater invisibility|phb"
+						],
+						"17": [
+							"dominate person|phb",
+							"dream|phb"
+						]
+					}
+				}
+			],
 			"subclassFeatures": [
 				"Hall of the Feywild|Planeshifter|JonomanPlaneshifter|Feywild|JonomanPlaneshifter|1",
 				"One with the Feywild Improvement|Planeshifter|JonomanPlaneshifter|Feywild|JonomanPlaneshifter|3",
diff --git a/class/KibblesTasty; Warlord.json b/class/KibblesTasty; Warlord.json
index 60aee06345..5a839a6067 100644
--- a/class/KibblesTasty; Warlord.json	
+++ b/class/KibblesTasty; Warlord.json	
@@ -1908,7 +1908,7 @@
 			"level": 3,
 			"header": 2,
 			"entries": [
-				"Additionally at 3rd level, your proficiency with magic gives the ability to cast magic of limited scope to shroud and protect your allies. You know two {@filter 1st-level wizard spells|spells|level=1|class=wizard|school=I;A}  of your choice, which must be from the abjuration or illusion schools on the Wizard spell list. These are Warlord spells for you. You can cast these spell by expending leadership dice equal to the level of the spell."
+				"Additionally at 3rd level, your proficiency with magic gives the ability to cast magic of limited scope to shroud and protect your allies. You know two {@filter 1st-level wizard spells|spells|level=1|class=wizard|school=I;A} of your choice, which must be from the abjuration or illusion schools on the Wizard spell list. These are Warlord spells for you. You can cast these spell by expending leadership dice equal to the level of the spell."
 			]
 		},
 		{
@@ -2273,6 +2273,44 @@
 			"spellcastingAbility": "int",
 			"className": "Warlord",
 			"classSource": "ktw",
+			"additionalSpells": [
+				{
+					"resourceName": "Leadership Die",
+					"known": {
+						"1": [
+							{
+								"choose": "level=0|class=bard;wizard|school=I;A;E",
+								"count": 2
+							}
+						],
+						"3": {
+							"resource": {
+								"1e": [
+									{
+										"choose": "level=1|class=wizard|school=I;A",
+										"count": 2
+									}
+								]
+							}
+						},
+						"15": {
+							"resource": {
+								"3e": [
+									{
+										"choose": "level=1;2;3|class=wizard|school=I;A",
+										"count": 3
+									}
+								]
+							}
+						}
+					},
+					"innate": {
+						"11": [
+							"mirror image"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"aundair's silent sanctum|exploringeberron",
 				"Blade Ward",
diff --git a/class/Kyle Grant; The Scholar.json b/class/Kyle Grant; The Scholar.json
index 0c7ae3c5bd..53782e8fab 100644
--- a/class/Kyle Grant; The Scholar.json	
+++ b/class/Kyle Grant; The Scholar.json	
@@ -3268,6 +3268,144 @@
 				"Advanced Planar Magic|Scholar|Scholar|Planar Sage|Scholar|13",
 				"Planes Tripper|Scholar|Scholar|Planar Sage|Scholar|18"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"13": {
+							"daily": {
+								"1e": [
+									"plane shift",
+									{
+										"choose": {
+											"from": [
+												"dispel evil and good",
+												"planar binding",
+												"forbiddance",
+												"planar ally"
+											],
+											"count": 1
+										}
+									}
+								]
+							}
+						},
+						"18": {
+							"daily": {
+								"1e": [
+									{
+										"choose": {
+											"from": [
+												"astral projection",
+												"gate"
+											],
+											"count": 1
+										}
+									}
+								]
+							}
+						}
+					},
+					"expanded": {
+						"1": [
+							"Control flames|XGE#c",
+							"Fire bolt|PHB#c",
+							"Friends|PHB#c",
+							"Frostbite|XGE#c",
+							"Guidance|PHB#c",
+							"Gust|XGE#c",
+							"Light|PHB#c",
+							"Mage hand|PHB#c",
+							"Message|PHB#c",
+							"Mold earth|XGE#c",
+							"Prestidigitation|PHB#c",
+							"Produce flame|PHB#c",
+							"Resistance|PHB#c",
+							"Shape water|XGE#c",
+							"Thaumaturgy|PHB#c",
+							"Thunderclap|XGE#c",
+							"Absorb Elements|XGE",
+							"Alarm|PHB",
+							"Chromatic orb|PHB",
+							"Command|PHB",
+							"Comprehend languages|PHB",
+							"Cure wounds|PHB",
+							"Detect evil and good|PHB",
+							"Detect magic|PHB",
+							"Disguise self|PHB",
+							"Find familiar|PHB",
+							"Fog cloud|PHB",
+							"Guiding bolt|PHB",
+							"Healing word|PHB",
+							"Hellish rebuke|PHB",
+							"Ice knife|XGE",
+							"Identify|PHB",
+							"Illusory script|PHB",
+							"Mage armor|PHB",
+							"Magic missile|PHB",
+							"Protection from evil and good|PHB",
+							"Purify food and drink|PHB",
+							"Sanctuary|PHB",
+							"Shield|PHB",
+							"Tenser's floating disk|PHB",
+							"Unseen servant|PHB",
+							"Alter self|PHB",
+							"Augury|PHB",
+							"Crown of madness|PHB",
+							"Darkvision|PHB",
+							"Detect thoughts|PHB",
+							"Dust devil|XGE",
+							"Enthrall|PHB",
+							"Flaming Sphere|PHB",
+							"Healing Spirit|XGE",
+							"Invisibility|PHB",
+							"Lesser restoration|PHB",
+							"Locate object|PHB",
+							"Magic weapon|PHB",
+							"Misty step|PHB",
+							"Nystul's magic aura|PHB",
+							"Rope trick|PHB",
+							"See invisibility|PHB",
+							"Suggestion|PHB",
+							"Zone of truth|PHB",
+							"Blink|PHB",
+							"Clairvoyance|PHB",
+							"Conjure animals|PHB",
+							"Counterspell|PHB",
+							"Daylight|PHB",
+							"Dispel magic|PHB",
+							"Elemental weapon|PHB",
+							"Gaseous form|PHB",
+							"Glyph of warding|PHB",
+							"Leomund's tiny hut|PHB",
+							"Magic circle|PHB",
+							"Meld into stone|PHB",
+							"Nondetection|PHB",
+							"Protection from energy|PHB",
+							"Remove curse|PHB",
+							"Sending|PHB",
+							"Summon lesser demons|XGE",
+							"Thunder step|XGE",
+							"Tongues|PHB",
+							"Water breathing|PHB",
+							"Arcane eye|PHB",
+							"Banishment|PHB",
+							"Charm monster|XGE",
+							"Confusion|PHB",
+							"Conjure minor elementals|PHB",
+							"Conjure woodland beings|PHB",
+							"Death ward|PHB",
+							"Dimension door|PHB",
+							"Divination|PHB",
+							"Freedom of movement|PHB",
+							"Guardian of faith|PHB",
+							"Greater invisibility|PHB",
+							"Locate creature|PHB",
+							"Mordenkainen's private sanctum|PHB",
+							"Summon greater demon|XGE"
+						]
+					}
+				}
+			],
 			"cantripProgression": [
 				0,
 				0,
diff --git a/class/LaserLlama; Alternate Barbarian.json b/class/LaserLlama; Alternate Barbarian.json
index f8ad3d77ca..769db3055b 100644
--- a/class/LaserLlama; Alternate Barbarian.json	
+++ b/class/LaserLlama; Alternate Barbarian.json	
@@ -1053,6 +1053,27 @@
 				"Totemic Aspect|Alternate Barbarian|LLAB|Totem Warrior|LLAB|6|LLAB",
 				"Spirit Walker|Alternate Barbarian|LLAB|Totem Warrior|LLAB|10|LLAB",
 				"Totemic Attunement|Alternate Barbarian|LLAB|Totem Warrior|LLAB|14|LLAB"
+			],
+			"subclassSpells": [
+				"beast sense",
+				"speak with animals"
+			],
+			"additionalSpells": [
+				{
+					"innate": {
+						"3": {
+							"ritual": [
+								"beast sense|PHB",
+								"speak with animals|PHB"
+							]
+						},
+						"10": {
+							"ritual": [
+								"commune with nature|PHB"
+							]
+						}
+					}
+				}
 			]
 		},
 		{
@@ -1079,6 +1100,22 @@
 				"Spiritual Ward|Alternate Barbarian|LLAB|Conduit|LLAB|6|LLAB",
 				"Greater Conduit|Alternate Barbarian|LLAB|Conduit|LLAB|10|LLAB",
 				"Vengeful Spirits|Alternate Barbarian|LLAB|Conduit|LLAB|14|LLAB"
+			],
+			"subclassSpells": [
+				"clairvoyance|PHB",
+				"commune|PHB"
+			],
+			"additionalSpells": [
+				{
+					"innate": {
+						"10": {
+							"will": [
+								"clairvoyance|PHB",
+								"commune|PHB"
+							]
+						}
+					}
+				}
 			]
 		},
 		{
@@ -1092,6 +1129,20 @@
 				"Elemental Body|Alternate Barbarian|LLAB|Storm|LLAB|6|LLAB",
 				"Storm Ward|Alternate Barbarian|LLAB|Storm|LLAB|10|LLAB",
 				"Primal Destruction|Alternate Barbarian|LLAB|Storm|LLAB|14|LLAB"
+			],
+			"subclassSpells": [
+				"produce flame|PHB"
+			],
+			"additionalSpells": [
+				{
+					"known": {
+						"6": {
+							"will": [
+								"produce flame|PHB#c"
+							]
+						}
+					}
+				}
 			]
 		},
 		{
@@ -1245,6 +1296,86 @@
 			"classSource": "LLAB",
 			"shortName": "Warden",
 			"spellcastingAbility": "wis",
+			"cantripProgression": [
+				0,
+				0,
+				1,
+				1,
+				1,
+				1,
+				1,
+				1,
+				1,
+				2,
+				2,
+				2,
+				2,
+				2,
+				2,
+				2,
+				2,
+				2,
+				2,
+				2
+			],
+			"additionalSpells": [
+				{
+					"expanded": {
+						"3": [
+							"control flames|xge#c",
+							"create bonfire|xge#c",
+							"druidcraft#c",
+							"frostbite|xge#c",
+							"guidance (alternate)|llspell#c",
+							"gust|xge#c",
+							"magic stone|xge#c",
+							"mold earth|xge#c",
+							"primal savagery (alternate)|llspell#c",
+							"shape water|xge#c",
+							"shillelagh#c",
+							"thorn whip#c",
+							"thunderclap|xge#c",
+							"absorb elements|xge",
+							"armor of agathys",
+							"compelled duel",
+							"cure wounds",
+							"earth tremor|xge",
+							"ensnaring strike (alternate)|llspell",
+							"entangle",
+							"fog cloud",
+							"hellish rebuke",
+							"inflict wounds",
+							"searing smite (alternate)|llspell",
+							"thunderous smite (alternate)|llspell",
+							"thunderwave",
+							"dust devil|xge",
+							"earthbind|xge",
+							"chromatic blade|llspell",
+							"gust of wind",
+							"magic weapon",
+							"shatter",
+							"spike growth",
+							"warding wind|xge",
+							"elemental weapon",
+							"plant growth",
+							"sleet storm",
+							"thunder step|XGE",
+							"tidal wave|XGE",
+							"wall of sand|xge",
+							"wall of water|xge",
+							"wind wall",
+							"control water",
+							"elemental bane|XGE",
+							"fire shield",
+							"grasping vine",
+							"guardian of nature|xge",
+							"ice storm",
+							"staggering smite (alternate)|llspell",
+							"storm sphere|XGE"
+						]
+					}
+				}
+			],
 			"subclassSpells": [
 				"control flames|xge",
 				"create bonfire|xge",
@@ -2601,7 +2732,7 @@
 			"level": 6,
 			"header": 3,
 			"entries": [
-				"You gain resistance to fire damage, and you learn the produce flame cantrip. Constitution is your spellcasting modifier for it, and you can cast it even while you are Raging."
+				"You gain resistance to fire damage, and you learn the {@spell produce flame} cantrip. Constitution is your spellcasting modifier for it, and you can cast it even while you are Raging."
 			]
 		},
 		{
@@ -2839,8 +2970,8 @@
 			"level": 10,
 			"header": 2,
 			"entries": [
-				"Your ability to conduct spiritual power has grown. While you are in a state of ecstasy from Conduit of Spirits, you can cast clairvoyance or commune without expending a spell slot or material components. However, after you finish casting either of these spells, your state of spiritual ecstasy ends.",
-				"When you cast clairvoyance in this way, the spell summons an invisible spirit you are communed with, and when you cast commune, you consult your bonded spirits for information."
+				"Your ability to conduct spiritual power has grown. While you are in a state of ecstasy from Conduit of Spirits, you can cast {@spell clairvoyance} or {@spell commune} without expending a spell slot or material components. However, after you finish casting either of these spells, your state of spiritual ecstasy ends.",
+				"When you cast {@spell clairvoyance} in this way, the spell summons an invisible spirit you are communed with, and when you cast {@spell commune}, you consult your bonded spirits for information."
 			]
 		},
 		{
@@ -2936,7 +3067,7 @@
 			"level": 3,
 			"header": 2,
 			"entries": [
-				"You have been chosen for a divine purpose. Spellcasters can cast spells that restore you to life (not undeath) such as raise dead, without needing the normal material components."
+				"You have been chosen for a divine purpose. Spellcasters can cast spells that restore you to life (not undeath) such as {@spell raise dead}, without needing the normal material components."
 			]
 		},
 		{
@@ -5203,7 +5334,18 @@
 				}
 			],
 			"entries": [
-				"You can spew a corrosive substance forth from your mouth. You learn the acid splash cantrip, using Constitution as your spellcasting modifier. You can cast this cantrip while Raging, and when you do, it deals additional damage equal to your Constitution modifier (minimum of +1)."
+				"You can spew a corrosive substance forth from your mouth. You learn the {@spell acid splash} cantrip, using Constitution as your spellcasting modifier. You can cast this cantrip while Raging, and when you do, it deals additional damage equal to your Constitution modifier (minimum of +1)."
+			],
+			"additionalSpells": [
+				{
+					"innate": {
+						"_": {
+							"will": [
+								"acid splash|PHB#c"
+							]
+						}
+					}
+				}
 			]
 		},
 		{
diff --git a/class/LaserLlama; Alternate Blood Hunter.json b/class/LaserLlama; Alternate Blood Hunter.json
index d891ae0c8c..eee5361b2d 100644
--- a/class/LaserLlama; Alternate Blood Hunter.json	
+++ b/class/LaserLlama; Alternate Blood Hunter.json	
@@ -340,12 +340,16 @@
 				{
 					"name": "Grim Psychometry (Ritual Only)",
 					"innate": {
-						"5": [
-							"identify"
-						],
-						"9": [
-							"legend lore"
-						]
+						"5": {
+							"ritual": [
+								"identify"
+							]
+						},
+						"9": {
+							"ritual": [
+								"legend lore"
+							]
+						}
 					}
 				}
 			],
@@ -956,7 +960,22 @@
 				"Divine Anathema|Alternate Blood Hunter|LLABH|Heretic|LLABH|13|LLABH",
 				"Utmost Transgression|Alternate Blood Hunter|LLABH|Heretic|LLABH|18|LLABH"
 			],
-			"foundryImg": "icons/magic/holy/angel-wings-gray.webp"
+			"foundryImg": "icons/magic/holy/angel-wings-gray.webp",
+			"additionalSpells": [
+				{
+					"known": {
+						"3": {
+							"will": [
+								{
+									"choose": "level=0|class=cleric",
+									"count": 2
+								}
+							]
+						}
+					},
+					"ability": "con"
+				}
+			]
 		},
 		{
 			"name": "Order of Undying Thirst",
@@ -1266,6 +1285,90 @@
 			],
 			"additionalSpells": [
 				{
+					"expanded": {
+						"3": [
+							"blade ward (alternate)|llspell#c",
+							"booming blade (alternate)|llspell#c",
+							"chill touch#c",
+							"control flames|xge#c",
+							"friends#c",
+							"frostbite|XGE#c",
+							"green-flame blade (alternate)|llspell#c",
+							"infestation|xge#c",
+							"lightning lure|tce#c",
+							"mage hand#c",
+							"magic stone|xge#c",
+							"mind sliver|tce#c",
+							"minor illusion#c",
+							"poison spray (alternate)|llspell#c",
+							"prestidigitation#c",
+							"resistance (alternate)|llspell#c",
+							"shocking grasp#c",
+							"spare the dying#c",
+							"sword burst (alternate)|llspell#c",
+							"toll the dead|xge#c",
+							"true strike (alternate)|llspell#c",
+							"absorb elements|xge",
+							"armor of agathys",
+							"arms of hadar",
+							"burning hands",
+							"cause fear|xge",
+							"charm person",
+							"compelled duel",
+							"detect evil and good",
+							"expeditious retreat",
+							"false life",
+							"hellish rebuke",
+							"hex",
+							"illusory script",
+							"inflict wounds",
+							"protection from evil and good",
+							"searing smite (alternate)|llspell",
+							"shield (alternate)|llspell",
+							"thunderous smite (alternate)|llspell",
+							"unseen servant",
+							"witch bolt (alternate)|llspell",
+							"branding smite (alternate)|llspell",
+							"cloud of daggers",
+							"crown of madness",
+							"darkness",
+							"earthbind|xge",
+							"hold person",
+							"invisibility",
+							"mind spike|xge",
+							"mirror image",
+							"misty step",
+							"ray of enfeeblement",
+							"scorching ray",
+							"shadow blade|xge",
+							"shatter",
+							"spider climb",
+							"suggestion",
+							"blinding smite (alternate)|llspell",
+							"counterspell (alternate)|llspell",
+							"dispel magic",
+							"enemies abound|xge",
+							"fear",
+							"hunger of hadar",
+							"hypnotic pattern (alternate)|llspell",
+							"intellect fortress|tce",
+							"magic circle",
+							"major image",
+							"remove curse",
+							"spirit shroud|tce",
+							"vampiric touch",
+							"banishment",
+							"blight",
+							"charm monster|xge",
+							"dimension door",
+							"elemental bane|XGE",
+							"hallucinatory terrain",
+							"phantasmal killer",
+							"staggering smite (alternate)|llspell",
+							"shadow of moil|xge",
+							"sickening radiance|xge"
+						]
+					},
 					"known": {
 						"3": [
 							{
@@ -2096,14 +2199,14 @@
 						"Intelligence is your spellcasting ability for your Witch Knight spells. You use your Intelligence when a spell refers to your spellcasting ability, when setting the saving throw DC, and when making a spell attack roll.",
 						{
 							"type": "abilityDc",
-							"name": "Spell save DC",
+							"name": "Spell",
 							"attributes": [
 								"int"
 							]
 						},
 						{
 							"type": "abilityAttackMod",
-							"name": "Spell attack modifier",
+							"name": "Spell",
 							"attributes": [
 								"int"
 							]
diff --git a/class/Matthew Mercer; Blood Hunter (2020).json b/class/Matthew Mercer; Blood Hunter (2020).json
index 616acbbd71..2043c159d0 100644
--- a/class/Matthew Mercer; Blood Hunter (2020).json	
+++ b/class/Matthew Mercer; Blood Hunter (2020).json	
@@ -18,6 +18,7 @@
 				"color": "940101"
 			}
 		],
+		"status": "deprecated",
 		"dateAdded": 1580617082,
 		"dateLastModified": 1729630006,
 		"_dateLastModifiedHash": "50d77e923d",
diff --git a/class/Matthew Mercer; Blood Hunter.json b/class/Matthew Mercer; Blood Hunter.json
index 26d5d9d379..8dc9da406e 100644
--- a/class/Matthew Mercer; Blood Hunter.json	
+++ b/class/Matthew Mercer; Blood Hunter.json	
@@ -13,6 +13,7 @@
 				"targetSchema": "1.0.0"
 			}
 		],
+		"status": "deprecated",
 		"dateAdded": 1515780480,
 		"dateLastModified": 1729630006,
 		"_dateLastModifiedHash": "3b023bdd84",
diff --git a/class/aiir_; Unearthed Aiircana Red Mage.json b/class/aiir_; Unearthed Aiircana Red Mage.json
index e348c979ad..9aa9bb5165 100644
--- a/class/aiir_; Unearthed Aiircana Red Mage.json	
+++ b/class/aiir_; Unearthed Aiircana Red Mage.json	
@@ -610,6 +610,73 @@
 				"Minor Dualcast|Red Mage|aiirRedMage|Red Wizard|aiirRedMage|11",
 				"Vermilion Spells|Red Mage|aiirRedMage|Red Wizard|aiirRedMage|14"
 			],
+			"additionalSpells": [
+				{
+					"known": {
+						"3": [
+							{
+								"choose": {
+									"from": [
+										"cure wounds",
+										"Ice Knife|XGE"
+									]
+								}
+							}
+						],
+						"4": [
+							{
+								"choose": {
+									"from": [
+										"Enhance Ability",
+										"Shatter"
+									]
+								}
+							}
+						],
+						"7": [
+							{
+								"choose": {
+									"from": [
+										"Fireball",
+										"Haste"
+									]
+								}
+							}
+						],
+						"10": [
+							{
+								"choose": {
+									"from": [
+										"Stoneskin",
+										"Wall of Fire"
+									]
+								}
+							}
+						],
+						"13": [
+							{
+								"choose": {
+									"from": [
+										"Cone of Cold",
+										"Mass Cure Wounds"
+									]
+								}
+							}
+						]
+					},
+					"resourceName": "Balance Die",
+					"innate": {
+						"14": {
+							"resource": {
+								"1": [
+									"Verflare|aiirRedMage",
+									"Verholy|aiirRedMage"
+								]
+							}
+						}
+					}
+				}
+			],
 			"subclassSpells": [
 				"Cure Wounds",
 				"Ice Knife|XGE",
diff --git a/collection/AcidArmy; AcidArmy's Book of Crossovers.json b/collection/AcidArmy; AcidArmy's Book of Crossovers.json
index c11dc04b00..b5c6ae7b6e 100644
--- a/collection/AcidArmy; AcidArmy's Book of Crossovers.json	
+++ b/collection/AcidArmy; AcidArmy's Book of Crossovers.json	
@@ -15,8 +15,8 @@
 			}
 		],
 		"status": "ready",
-		"dateAdded": 1700350480,
-		"dateLastModified": 0,
+		"dateAdded": 1730324407,
+		"dateLastModified": 1735818428,
 		"edition": "classic",
 		"_dateLastModifiedHash": "a76c270dcd"
 	},
diff --git a/collection/Various; Lyra's Legendarium.json b/collection/Various; Lyra's Legendarium.json
index 1368f99a8b..19f9a0de95 100644
--- a/collection/Various; Lyra's Legendarium.json	
+++ b/collection/Various; Lyra's Legendarium.json	
@@ -136,18 +136,12 @@
 								"type": "homebrew",
 								"entries": [
 									{
-										"type": "entries",
-										"name": "Blink Dog",
-										"entries": [
-											"A constellation of a {@creature Blink Dog} appears on you. When you activate this form and as a {@variantrule Bonus Action|XPHB} on your subsequent turns while it lasts, you can {@variantrule Teleportation|XPHB|Teleport} up to 20 feet to an unoccupied space."
-										]
+										"type": "refSubclassFeature",
+										"subclassFeature": "Blink Dog|Druid|XPHB|Stars|ASRT|3"
 									},
 									{
-										"type": "entries",
-										"name": "Girallon",
-										"entries": [
-											"A constellation of a {@creature Girallon|MPMM} appears on you, with two additional ethereal arms extending from your torso. When you activate this form and as a {@variantrule Bonus Action|XPHB} on your subsequent turns while it lasts, you can make a melee spell attack with your additional limbs targeting one creature within 5 feet of yourself. On a hit, the attack deals Radiant damage equal to {@dice 1d8} plus your Wisdom modifier."
-										]
+										"type": "refSubclassFeature",
+										"subclassFeature": "Girallon|Druid|XPHB|Stars|ASRT|3"
 									}
 								]
 							}
@@ -159,6 +153,32 @@
 				}
 			}
 		},
+		{
+			"name": "Blink Dog",
+			"source": "ASRT",
+			"className": "Druid",
+			"classSource": "XPHB",
+			"subclassShortName": "Stars",
+			"subclassSource": "ASRT",
+			"level": 3,
+			"header": 2,
+			"entries": [
+				"A constellation of a {@creature Blink Dog} appears on you. When you activate this form and as a {@variantrule Bonus Action|XPHB} on your subsequent turns while it lasts, you can {@variantrule Teleportation|XPHB|Teleport} up to 20 feet to an unoccupied space."
+			]
+		},
+		{
+			"name": "Girallon",
+			"source": "ASRT",
+			"className": "Druid",
+			"classSource": "XPHB",
+			"subclassShortName": "Stars",
+			"subclassSource": "ASRT",
+			"level": 3,
+			"header": 2,
+			"entries": [
+				"A constellation of a {@creature Girallon|MPMM} appears on you, with two additional ethereal arms extending from your torso. When you activate this form and as a {@variantrule Bonus Action|XPHB} on your subsequent turns while it lasts, you can make a melee spell attack with your additional limbs targeting one creature within 5 feet of yourself. On a hit, the attack deals Radiant damage equal to {@dice 1d8} plus your Wisdom modifier."
+			]
+		},
 		{
 			"name": "Twinkling Constellations",
 			"source": "ASRT",
@@ -182,7 +202,7 @@
 							{
 								"type": "homebrew",
 								"entries": [
-									"While the {@creature Girallon|MPMM} is active you can make two melee spell attacks as a {@variantrule Bonus Action|XPHB} rather than one. When you use the {@variantrule Teleportation|XPHB} feature of the {@creature Blink Dog} you can bring one willing creature with you, if the creature is unwilling it must make a Constitution save against your Spell Save DC."
+									"While the {@creature Girallon|MPMM} is active you can make two melee spell attacks as a {@variantrule Bonus Action|XPHB} rather than one. When you use the {@variantrule Teleportation|XPHB} feature of the {@creature Blink Dog} you can bring one willing creature with you, if the creature is unwilling it must make a Constitution save against {@dcYourSpellSave}."
 								]
 							}
 						]