diff --git a/COM_5ePack_UA - Starter Spells.user b/COM_5ePack_UA - Starter Spells.user
index 419dec90..5ece2527 100644
--- a/COM_5ePack_UA - Starter Spells.user	
+++ b/COM_5ePack_UA - Starter Spells.user	
@@ -12,6 +12,7 @@
     <tag group="sDuration" tag="Concent"/>
     <tag group="sLevel" tag="1"/>
     <tag group="sCastTime" tag="Action1"/>
+    <tag group="sClass" tag="cHelpWlk"/>
     </thing>
   <thing id="sp5CGuiHan" name="Guiding Hand" description="Target a space you can see within range. You create a tiny incorporeal hand in that space. The hand exists for the duration, but it disappears if you teleport or you travel to a different plane of existence. \n\nWhen the hand appears, you name one major landmark, such as a city, mountain, castle, or battlefield on the same plane of existence as you. Someone in history must have visited the site and mapped it. If the landmark appears on no map in existence, the spell fails. Otherwise, whenever you move toward the hand, it moves away from you at the same speed you moved, and it moves in the direction of the landmark, always remaining 5 feet away from you. \n\nIf you don’t move toward the hand, it remains in place until you do and beckons for you to follow once every 1d4 minutes." compset="Spell">
     <fieldval field="sRange" value="5 feet"/>
@@ -28,6 +29,7 @@
     <tag group="sComp" tag="V"/>
     <tag group="sComp" tag="S"/>
     <tag group="sLevel" tag="1"/>
+    <tag group="sClass" tag="cHelpDrd"/>
     </thing>
   <thing id="sp5CCeremo" name="Ceremony" description="You perform one of several religious ceremonies. When you cast the spell, choose one of the following ceremonies, the target of which must be within 10 feet of you throughout the casting.\n\n{b}Atonement.{/b} You touch one willing creature whose alignment has changed, and you make a DC 20 Wisdom (Insight) check. On a success, you restore the target to its original alignment.Bless Water. You touch one vial of water and cause it to become holy water. \n\n{b}Coming of Age.{/b} You touch one humanoid old enough to be a young adult. For the next 24 hours, whenever the target makes an ability check, it can roll a d4 and add the number rolled to the ability check. A creature can benefit from this ceremony just once.\n\n{b}Dedication.{/b} You touch one humanoid who would willingly convert to your religion or who wishes to be dedicated to your god’s service. For the next 24 hours, whenever the target makes a saving throw, it can roll a d4 and add the number rolled to the save. A creature can benefit from this ceremony just once.\n\n{b}Funeral Rite.{/b} You bless one corpse within 5 feet of you. For the next 24 hours, the target can’t become undead by any means short of a wish spell. \n\n{b}Investiture.{/b} You touch one willing humanoid. Choose one 1st-level spell you have prepared and expend a spell slot and any material components as if you were casting that spell. The spell has no effect. Instead, the target can cast this spell once without having to expend a spell slot or use material components. If the target doesn’t cast the spell within 1 hour, the invested spell is lost.\n\n{b}Marriage.{/b} You touch adult humanoids willing to be bonded together in marriage. For the next 24 hours, each target gains a +2 bonus to AC and saving throws while they are within 30 feet of each other. A creature can benefit from this ceremony just once." compset="Spell">
     <fieldval field="sCompDesc" value="25 gp worth of powdered silver"/>
@@ -75,13 +77,14 @@
     <fieldval field="sRange" value="Self (5-foot radius)"/>
     <usesource source="p5eStSUACP"/>
     <tag group="sSchool" tag="Evocation"/>
-    <tag group="sClass" tag="cHelpClr"/>
     <tag group="sRange" tag="Personal"/>
     <tag group="sLevel" tag="1"/>
     <tag group="sDuration" tag="Instant"/>
     <tag group="sComp" tag="V"/>
     <tag group="sComp" tag="S"/>
     <tag group="sCastTime" tag="Action1"/>
+    <tag group="sClass" tag="cHelpWlk"/>
+    <tag group="sClass" tag="cHelpWiz"/>
     </thing>
   <thing id="sp5CInfest" name="Infestation" description="You cause mites, fleas, and other parasites to appear momentarily on one creature you can see within range. The target must succeed on a Constitution saving throw or take 1d6 piercing damage. If the target takes any of that damage, the target moves 5 feet in a random direction. Roll a d8 for the direction: 1, north; 2, northeast; 3, east; 4, southeast; 5, south; 6, southwest; 7, west; or 8, northwest.\n\nThe spell’s damage increases by 1d6 when you reach 5th level (2d6), 11th level (3d6), and 17th level (4d6)." compset="Spell">
     <fieldval field="sCompDesc" value="a living flea"/>
@@ -133,7 +136,6 @@
     <tag group="sDuration" tag="Concent"/>
     <tag group="sSchool" tag="Divination"/>
     <tag group="sClass" tag="cHelpWiz"/>
-    <tag group="sClass" tag="cHelpBrd"/>
     <tag group="sClass" tag="cHelpWlk"/>
     </thing>
   <thing id="sp5CSnare" name="Snare" description="While you cast this spell, you use the cord or rope to create a circle with a 5-foot radius on a flat surface within your reach. When you finish casting, the cord or rope disappears to become a magical trap.\n\nThe trap is nearly invisible and requires a successful Intelligence (Investigation) check against your spell save DC to be found.\n\nThe trap triggers when a Small creature or larger moves into the area protected by the spell. The triggering creature must succeed on a Dexterity saving throw or fall prone and be hoisted into the air until it hangs upside down 3 feet above the protected surface, where it is restrained.\n\nThe restrained creature can make a Dexterity saving throw with disadvantage at the end of each of its turns and ends the restrained effect on a success. Alternatively, another creature that can reach the restrained creature can use an action to make an Intelligence (Arcana) check against your spell save DC. On a success, the restrained effect also ends." compset="Spell">