diff --git a/forge-gui/res/cardsfolder/upcoming/barroom_brawl.txt b/forge-gui/res/cardsfolder/upcoming/barroom_brawl.txt
index d80c672ba22..3929fda1fa0 100644
--- a/forge-gui/res/cardsfolder/upcoming/barroom_brawl.txt
+++ b/forge-gui/res/cardsfolder/upcoming/barroom_brawl.txt
@@ -1,7 +1,7 @@
 Name:Barroom Brawl
 ManaCost:1 G
 Types:Sorcery
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ Fight | TgtPrompt$ Choose target creature you control | SubAbility$ DBFight | SpellDescription$ Target creature you control fights target creature you don't control. (Each deals damage equal to its power to the other.)
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ Fight | TgtPrompt$ Choose target creature you control | SubAbility$ DBFight | SpellDescription$ SpellDescription$ Target creature you control fights target creature the opponent to your left controls. Then that player may copy this spell and may choose new targets for the copy.
 SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.ControlledBy NextPlayerToYourLeft | TgtPrompt$ Choose target creature controlled by the opponent to your left | SubAbility$ DBCopy
 SVar:DBCopy:DB$ CopySpellAbility | Defined$ Parent | Controller$ NextPlayerToYourLeft | Optional$ True | AILogic$ ChainOfAcid | StackDescription$ None | MayChooseTarget$ True
 Oracle:Target creature you control fights target creature the opponent to your left controls. Then that player may copy this spell and may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/upcoming/clan_crafter.txt b/forge-gui/res/cardsfolder/upcoming/clan_crafter.txt
index 5ddf8d72998..749d7f5f53f 100644
--- a/forge-gui/res/cardsfolder/upcoming/clan_crafter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/clan_crafter.txt
@@ -6,6 +6,6 @@ SVar:SacArt:AB$ PutCounter | Cost$ 2 Sac<1/Artifact> | Defined$ Self | CounterTy
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
 SVar:BuffedBy:Artifact
 DeckHints:Type$Artifact
-DeckHas:Ability$Counters
+DeckHas:Ability$Sacrifice|Counters
 AI:RemoveDeck:NonCommander
 Oracle:Commander creatures you own have "{2}, Sacrifice an artifact: Put a +1/+1 counter on this creature and draw a card."
diff --git a/forge-gui/res/cardsfolder/upcoming/harper_recruiter.txt b/forge-gui/res/cardsfolder/upcoming/harper_recruiter.txt
index 0611d6cbed6..36e8d2afe7c 100644
--- a/forge-gui/res/cardsfolder/upcoming/harper_recruiter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/harper_recruiter.txt
@@ -5,6 +5,7 @@ PT:3/1
 K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDigMulti | TriggerDescription$ Whenever CARDNAME attacks, look at the top four cards of your library. You may reveal a Cleric card, a Rogue card, a Warrior card, and/or a Wizard card from among them and put those cards into your hand. Put the rest on the bottom of your library in a random order.
 SVar:TrigDigMulti:DB$ DigMultiple | DigNum$ 4 | ChangeValid$ Card.Cleric,Card.Rogue,Card.Warrior,Card.Wizard | SourceZone$ Library | DestinationZone$ Hand | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True | Optional$ True
+SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Party
 DeckHints:Type$Cleric|Rogue|Warrior|Wizard
 Oracle:Whenever Harper Recruiter attacks, look at the top four cards of your library. You may reveal a Cleric card, a Rogue card, a Warrior card, and/or a Wizard card from among them and put those cards into your hand. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/upcoming/multiclass_baldric.txt b/forge-gui/res/cardsfolder/upcoming/multiclass_baldric.txt
index 96b551befb3..56e72357ac2 100644
--- a/forge-gui/res/cardsfolder/upcoming/multiclass_baldric.txt
+++ b/forge-gui/res/cardsfolder/upcoming/multiclass_baldric.txt
@@ -2,11 +2,11 @@ Name:Multiclass Baldric
 ManaCost:1
 Types:Artifact Equipment
 K:Equip:2
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Lifelink | IsPresent$ Cleric.YouCtrl | PresentCompare$ GE1 | Description$ Equipped creature has lifelink if you control a Cleric.
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Deathtouch | IsPresent$ Rogue.YouCtrl | PresentCompare$ GE1 | Description$ Equipped creature has lifelink if you control a Rogue.
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Haste | IsPresent$ Warrior.YouCtrl | PresentCompare$ GE1 | Description$ Equipped creature has lifelink if you control a Warrior.
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Flying | IsPresent$ Wizard.YouCtrl | PresentCompare$ GE1 | Description$ Equipped creature has lifelink if you control a Wizard.
-R:Event$ DamageDone | ActiveZones$ Battlefield | Prevent$ True | ValidTarget$ Creature.EquippedBy | CheckSVar$ X | SVarCompare$ EQ4 | Description$ Prevent all damage that would be dealt to enchanted creature.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Lifelink | IsPresent$ Cleric.YouCtrl | PresentCompare$ GE1 | Description$ Equipped creature has lifelink if you control a Cleric, deathtouch if you control a Rogue, haste if you control a Warrior, and flying if you control a Wizard.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Deathtouch | IsPresent$ Rogue.YouCtrl | PresentCompare$ GE1
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Haste | IsPresent$ Warrior.YouCtrl | PresentCompare$ GE1
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Flying | IsPresent$ Wizard.YouCtrl | PresentCompare$ GE1
+R:Event$ DamageDone | ActiveZones$ Battlefield | Prevent$ True | ValidTarget$ Creature.EquippedBy | CheckSVar$ X | SVarCompare$ EQ4 | Description$ As long as you have a full party, prevent all damage that would be dealt to equipped creature.
 SVar:X:Count$Party
 DeckHas:Ability$Party
 DeckHints:Type$Cleric|Rogue|Warrior|Wizard
diff --git a/forge-gui/res/cardsfolder/upcoming/solemn_doomguide.txt b/forge-gui/res/cardsfolder/upcoming/solemn_doomguide.txt
index 08558ff7e97..0632f73b454 100644
--- a/forge-gui/res/cardsfolder/upcoming/solemn_doomguide.txt
+++ b/forge-gui/res/cardsfolder/upcoming/solemn_doomguide.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Creature Tiefling Cleric
 PT:4/5
 K:Flying
-S:Mode$ Continuous | Affected$ Creature.Cleric+YouCtrl,Creature.Rogue+YouCtrl,Creature.Warrior+YouCtrl,Creature.Wizard+YouCtrl | AffectedZone$ Graveyard | AddKeyword$ Unearth:1 B | Description$ Each creature card in your graveyard that's a Cleric, Rogue, Warrior, and/or Wizard has unearth {1}{B}.
+S:Mode$ Continuous | Affected$ Creature.Cleric+YouCtrl,Creature.Rogue+YouCtrl,Creature.Warrior+YouCtrl,Creature.Wizard+YouCtrl | AffectedZone$ Graveyard | AddKeyword$ Unearth:1 B | Description$ Each creature card in your graveyard that's a Cleric, Rogue, Warrior, and/or Wizard has unearth {1}{B}. ({1}{B}: Return the card to the battlefield. The creature gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Party
 DeckHints:Type$Cleric|Rogue|Warrior|Wizard