diff --git a/class/LaserLlama; Magus Class.json b/class/LaserLlama; Magus Class.json
index 8b1daedb7c..ddb0cff4f6 100644
--- a/class/LaserLlama; Magus Class.json	
+++ b/class/LaserLlama; Magus Class.json	
@@ -11,7 +11,8 @@
 				"convertedBy": [
 					"JoeyJoestar",
 					"Kachow#2737",
-					"Dazzle"
+					"Dazzle",
+					"ACOG_Muffin"
 				],
 				"version": "3.1.0",
 				"color": "025b79",
@@ -791,9 +792,9 @@
 			"classSource": "LLMC",
 			"level": 6,
 			"entries": [
-				"At 6th level, you learn to conjure an Aegis, a barrier of arcane power to disrupt magical assaults. If you take damage from a spell or a magical effect, you can use a reaction to reduce the damage by 1d8 + your Intelligence modifier. If you reduce the damage to 0, that instance of the spell or effect is instantly dispelled and has no effect on you or any of its other targets.",
-				"For example, if you if you reduced the damage of a fireball to 0, the fireball is dispelled. But, if you reduce the damage of a bolt from call lightning to 0, only that bolt is dispelled.",
-				"As part of this reaction, you can expend one spell slot and further reduce the damage by an additional 2d8 for a 1st-level spell slot, plus another 1d8 for each spell level above 1st, to a maximum of 6d8 (a total of 7d8 + your Intelligence modifier)."
+				"At 6th level, you learn to conjure an Aegis, a barrier of arcane power to disrupt magical assaults. If you take damage from a spell or a magical effect, you can use a reaction to reduce the damage by {@dice 1d8} + your Intelligence modifier. If you reduce the damage to 0, that instance of the spell or effect is instantly dispelled and has no effect on you or any of its other targets.",
+				"For example, if you if you reduced the damage of a {@spell fireball} to 0, the fireball is dispelled. But, if you reduce the damage of a bolt from {@spell call lightning} to 0, only that bolt is dispelled.",
+				"As part of this reaction, you can expend one spell slot and further reduce the damage by an additional {@dice 2d8} for a 1st-level spell slot, plus another {@dice 1d8} for each spell level above 1st, to a maximum of {@dice 6d8} (a total of {@dice 7d8} + your Intelligence modifier)."
 			]
 		},
 		{
@@ -858,7 +859,7 @@
 			"classSource": "LLMC",
 			"level": 14,
 			"entries": [
-				"Your Aegis is a stalwart shield against the arcane and can be used to restore your spent power. Starting at 14th level, you roll d10s, in place of d8s, whenever you use your Aegis.",
+				"Your Aegis is a stalwart shield against the arcane and can be used to restore your spent power. Starting at 14th level, you roll {@dice d10s}, in place of {@dice d8}s, whenever you use your Aegis.",
 				"In addition, when you expend a spell slot to empower your Aegis and reduce the damage of the incoming spell to 0, you instantly regain one expended spell slot of your choice that is at least one level lower than the spell slot you expended."
 			]
 		},
@@ -1196,7 +1197,7 @@
 			"source": "LLMC",
 			"className": "Magus",
 			"classSource": "LLMC",
-			"shortName": "Sentinels",
+			"shortName": "Shades",
 			"subclassFeatures": [
 				"Order of Shades|Magus|LLMC|Shades|LLMC|3",
 				"From the Shadows|Magus|LLMC|Shades|LLMC|7",
@@ -1376,7 +1377,7 @@
 					"items": [
 						"You learn {@filter two cantrips of your choice from the wizard spell list|spells|level=0|class=Wizard}. They count as Magus spells for you, and they use your Intelligence as their spellcasting ability, but they don't count against your total number of Spells Known.",
 						"At the end of each long rest, you can replace one Magus spell you know with a Magus spell of the same level.",
-						"You gain the ability to cast any Magus spell you know asa ritual, so long as that spell has the ritual tag."
+						"You gain the ability to cast any Magus spell you know as a ritual, so long as that spell has the ritual tag."
 					]
 				}
 			]
@@ -1615,7 +1616,7 @@
 					"rows": [
 						[
 							"3rd",
-							"{@spell armor of agathys|phb}, {@spell shield of faith|phb}"
+							"{@spell armor of Agathys|phb}, {@spell shield of faith|phb}"
 						],
 						[
 							"5th",
@@ -1712,9 +1713,9 @@
 				{
 					"type": "list",
 					"items": [
-						"When you spend Frost as part of an attack you roll a d6 in place of the normal d4 for any cold damage you do.",
+						"When you spend Frost as part of an attack you roll a {@dice d6} in place of the normal {@dice d4} for any cold damage you do.",
 						"If you reduce a creature's speed to 0 with Rimeguard or Glacial Defense it is also restrained while its speed is 0.",
-						"A creature with temporary hit points from Glacial Defense is resistant to bludgeoning, piercing, and slashing damage"
+						"A creature with temporary hit points from Glacial Defense is resistant to bludgeoning, piercing, and slashing damage."
 					]
 				}
 			]
@@ -1730,44 +1731,14 @@
 			"level": 3,
 			"entries": [
 				"The Magi known as Blade Dancers dedicate their lives to mastery over the secret combat style of the Blade Dance. This esoteric trance allows a Magi to empty their mind of any emotions or distractions and become one with blade and spell, transforming into a deadly whirlwind of arcane power and deadly steel. Magi traditionally pass this secret technique from master to apprentice in an unbroken chain.",
-				{
-					"type": "refSubclassFeature",
-					"subclassFeature": "Blade Dance|Magus|LLMC|Blade Dancers|LLMC|3"
-				},
+				
 				{
 					"type": "refSubclassFeature",
 					"subclassFeature": "Blade Dancer Spells|Magus|LLMC|Blade Dancers|LLMC|3"
-				}
-			]
-		},
-		{
-			"name": "Blade Dance",
-			"source": "LLMC",
-			"className": "Magus",
-			"classSource": "LLMC",
-			"page": 7,
-			"subclassShortName": "Blade Dancers",
-			"subclassSource": "LLMC",
-			"level": 3,
-			"header": 1,
-			"entries": [
-				"You have learned the signature technique of your Order, the Blade Dance. So long as you are not wearing heavy armor or wielding a heavy weapon, you can use a bonus action to enter a Blade Dance. Your Blade Dance lasts for 1 minute, and while the Blade Dance is active, you gain the benefits listed below:",
-				{
-					"type": "list",
-					"items": [
-						"Your walking speed increases by 10 feet.",
-						"You gain a +1 bonus to your Armor Class.",
-						"Once on your turn when you roll damage for an attack or spell, you can roll the damage dice twice and use the higher result.",
-						"You have advantage on {@skill Acrobatics} and {@skill Athletics} checks."
-					]
 				},
-				"Your Blade Dance instantly ends if you are incapacitated, if you don heavy armor or use a heavy weapon, or you end it as a bonus action. Once you use this feature you must complete a short or long rest before you can use it again. If you have no uses left, you can expend a spell slot of 1st-level or higher to use this feature again.",
 				{
-					"type": "inset",
-					"name": "Blade Song & Dance",
-					"entries": [
-						"The Order of Blade Dancers serves as the Magus' counterpart to the Wizard's School of Bladesinging. While the abilities differ mechanically, the benefits of Blade Dance and Bladesong should not stack."
-					]
+					"type": "refSubclassFeature",
+					"subclassFeature": "Blade Dance|Magus|LLMC|Blade Dancers|LLMC|3"
 				}
 			]
 		},
@@ -1818,6 +1789,37 @@
 				}
 			]
 		},
+		{
+			"name": "Blade Dance",
+			"source": "LLMC",
+			"className": "Magus",
+			"classSource": "LLMC",
+			"page": 7,
+			"subclassShortName": "Blade Dancers",
+			"subclassSource": "LLMC",
+			"level": 3,
+			"header": 1,
+			"entries": [
+				"You have learned the signature technique of your Order, the Blade Dance. So long as you are not wearing heavy armor or wielding a heavy weapon, you can use a bonus action to enter a Blade Dance. Your Blade Dance lasts for 1 minute, and while the Blade Dance is active, you gain the benefits listed below:",
+				{
+					"type": "list",
+					"items": [
+						"Your walking speed increases by 10 feet.",
+						"You gain a +1 bonus to your Armor Class.",
+						"Once on your turn when you roll damage for an attack or spell, you can roll the damage dice twice and use the higher result.",
+						"You have advantage on {@skill Acrobatics} and {@skill Athletics} checks."
+					]
+				},
+				"Your Blade Dance instantly ends if you are incapacitated, if you don heavy armor or use a heavy weapon, or you end it as a bonus action. Once you use this feature you must complete a short or long rest before you can use it again. If you have no uses left, you can expend a spell slot of 1st-level or higher to use this feature again.",
+				{
+					"type": "inset",
+					"name": "Blade Song & Dance",
+					"entries": [
+						"The Order of Blade Dancers serves as the Magus' counterpart to the Wizard's School of Bladesinging. While the abilities differ mechanically, the benefits of Blade Dance and Bladesong should not stack."
+					]
+				}
+			]
+		},
 		{
 			"name": "Fluid Steps",
 			"source": "LLMC",
@@ -2054,10 +2056,9 @@
 			"level": 20,
 			"header": 2,
 			"entries": [
-				"You have mastered the sinister blood magic within your soul. As an aciton, you can take on the form of a vampiric warlord, gaining the following benefits for 1 minute:",
+				"You have mastered the sinister blood magic within your soul. As an action, you can take on the form of a vampiric warlord, gaining the following benefits for 1 minute:",
 				{
 					"type": "list",
-					"style": "list-no-bullets",
 					"items": [
 						"When you deal necrotic damage to a creature with a spell of 1st-level or higher, you can gain yourself temporary hit points equal to half the necrotic damage you dealt.",
 						"You gain a flying speed equal to your walking speed.",
@@ -2195,7 +2196,7 @@
 					"items": [
 						"It becomes Medium in size, and can bear you as a rider so long as you are also Medium in size, or smaller.",
 						"It gains temporary hit points equal to your Magus level.",
-						"You roll d6s for its Claw attack damage in place of d4s.",
+						"You roll {@dice d6}s for its Claw attack damage in place of {@dice d4}s.",
 						"As a bonus action, you can command your Companion to exhale Essence breath in a 15-foot cone, forcing creatures in that area to make a Dexterity saving throw. Targets take {@dice 3d6} damage of its Essence damage type on a failed save, and half as much damage on a successful save."
 					]
 				},
@@ -2243,7 +2244,7 @@
 					"items": [
 						"It retains its alignment and personality.",
 						"It replaces any mentions of fire with its Essence type.",
-						"It has a number of d10 hit dice equal to your Magus level.",
+						"It has a number of {@dice d10} hit dice equal to your Magus level.",
 						"It no longer benefits from Infusion of Might.",
 						"It gains the ability to move through any space that is large enough for a Medium creature without squeezing, so long as it is not flying or carrying a rider on its back."
 					]
@@ -2408,11 +2409,11 @@
 				"Magi who join the Order of Sentinels almost always do so for noble reasons. Combing their talent for the arcane with their signature style of defensive combat to serve as guardians for mages, nobles, and other important figures. While they are ultimately loyal to their Order, Sentinels make fierce friends and will stand side by side with their allies against any foe.",
 				{
 					"type": "refSubclassFeature",
-					"subclassFeature": "Armored Guardian|Magus|LLMC|Sentinels|LLMC|3"
+					"subclassFeature": "Sentinel Spells|Magus|LLMC|Sentinels|LLMC|3"
 				},
 				{
 					"type": "refSubclassFeature",
-					"subclassFeature": "Sentinel Spells|Magus|LLMC|Sentinels|LLMC|3"
+					"subclassFeature": "Armored Guardian|Magus|LLMC|Sentinels|LLMC|3"
 				},
 				{
 					"type": "refSubclassFeature",
@@ -2420,20 +2421,6 @@
 				}
 			]
 		},
-		{
-			"name": "Armored Guardian",
-			"source": "LLMC",
-			"className": "Magus",
-			"classSource": "LLMC",
-			"page": 10,
-			"subclassShortName": "Sentinels",
-			"subclassSource": "LLMC",
-			"level": 3,
-			"header": 1,
-			"entries": [
-				"Unlike most Magi you have trained to take a hit. When you join this Order, you gain proficiency with heavy armor, and your walking speed is not reduced by wearing heavy armor."
-			]
-		},
 		{
 			"name": "Sentinel Spells",
 			"source": "LLMC",
@@ -2481,6 +2468,20 @@
 				}
 			]
 		},
+		{
+			"name": "Armored Guardian",
+			"source": "LLMC",
+			"className": "Magus",
+			"classSource": "LLMC",
+			"page": 10,
+			"subclassShortName": "Sentinels",
+			"subclassSource": "LLMC",
+			"level": 3,
+			"header": 1,
+			"entries": [
+				"Unlike most Magi you have trained to take a hit. When you join this Order, you gain proficiency with heavy armor, and your walking speed is not reduced by wearing heavy armor."
+			]
+		},
 		{
 			"name": "Sentinel's Bond",
 			"source": "LLMC",
@@ -2508,7 +2509,7 @@
 			"level": 7,
 			"header": 2,
 			"entries": [
-				"The magic of your Aegis and your Sentinel's Bond empower each other. When you use your Aegis to reduce the damage of a spell or effect that also targets your Ward, you can roll d12s in place of any d8s you would roll to reduce the damage.",
+				"The magic of your Aegis and your Sentinel's Bond empower each other. When you use your Aegis to reduce the damage of a spell or effect that also targets your Ward, you can roll {@dice d12}s in place of any {@dice d8}s you would roll to reduce the damage.",
 				"Also, if you start your turn within 10 feet of your Ward, you can grant both you and your Ward temporary hit points equal to your Intelligence modifier (minimum of 1)."
 			]
 		},
@@ -2681,7 +2682,7 @@
 			"level": 15,
 			"header": 2,
 			"entries": [
-				"You have learned to use your Aegis to reflect the magic of your foes onto them. If you expend a spell slot to empower your Aegis and reduce the damage of the spell or effect to zero, you can reflect the spell back at the caster instead of regaining one of your expended spell slots.",
+				"You have learned to use your Aegis to reflect the magic of your foes onto them. If you expend a spell slot to empower your Aegis and reduce the damage of the spell or effect to 0, you can reflect the spell back at the caster instead of regaining one of your expended spell slots.",
 				"When you do, you instantly cast the spell as part of the same reaction, using your Magus Spellcasting ability, without expending a spell slot, but you must target the original caster.",
 				"If the spell you reflect requires concentration, you must concentrate on the spell in order to maintain its effects."
 			]
@@ -2738,7 +2739,7 @@
 			"source": "LLMC",
 			"page": 2,
 			"entries": [
-				"You gain proficiency with shields as a martial melee weapon. On hit, your shield attacks deal 2d4 bludgeoning damage. If you are wielding a shield and no other weapon, you gain a +1 bonus to your shield attack rolls and to your Armor Class."
+				"You gain proficiency with shields as a martial melee weapon. On hit, your shield attacks deal {@dice 2d4} bludgeoning damage. If you are wielding a shield and no other weapon, you gain a +1 bonus to your shield attack rolls and to your Armor Class."
 			],
 			"featureType": [
 				"FS:LLMC"
@@ -2796,7 +2797,7 @@
 				}
 			],
 			"hp": {
-				"special": "5 + five times your magus level ({@italic the Companion has a number of d6 hit dice equal to your magus level})"
+				"special": "5 + five times your magus level ({@italic the Companion has a number of {@dice d6} hit dice equal to your magus level})"
 			},
 			"speed": {
 				"walk": 20,