diff --git a/forge-gui/res/cardsfolder/c/chamber_sentry.txt b/forge-gui/res/cardsfolder/c/chamber_sentry.txt
index 69f7c2ac482..3816568e85d 100644
--- a/forge-gui/res/cardsfolder/c/chamber_sentry.txt
+++ b/forge-gui/res/cardsfolder/c/chamber_sentry.txt
@@ -3,9 +3,9 @@ ManaCost:X
 Types:Artifact Creature Construct
 PT:0/0
 K:etbCounter:P1P1:Y:no Condition:CARDNAME enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.
-SVar:X:Count$Converge
-A:AB$ DealDamage | Announce$ Y | Cost$ Y T SubCounter<X/P1P1> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ Y | References$ Y | SpellDescription$ CARDNAME deals Y damage to any target.
-SVar:Y:Count$xPaid
+SVar:Y:Count$Converge
+A:AB$ DealDamage | Announce$ X | Cost$ X T SubCounter<X/P1P1> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals X damage to any target.
+SVar:X:Count$xPaid
 A:AB$ ChangeZone | Cost$ W U B R G | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to your hand.
 SVar:DiscardMe:1
 Oracle:Chamber Sentry enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.\n{X}, {T}, Remove X +1/+1 counters from Chamber Sentry: It deals X damage to any target.\n{W}{U}{B}{R}{G}: Return Chamber Sentry from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/g/glaive_of_the_guildpact.txt b/forge-gui/res/cardsfolder/g/glaive_of_the_guildpact.txt
index e42184fb9e8..082cf91e31d 100644
--- a/forge-gui/res/cardsfolder/g/glaive_of_the_guildpact.txt
+++ b/forge-gui/res/cardsfolder/g/glaive_of_the_guildpact.txt
@@ -1,10 +1,9 @@
 Name:Glaive of the Guildpact
 ManaCost:2
 Types:Artifact Equipment
+K:Equip:3
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ X | AddKeyword$ Vigilance & Menace | Description$ Equipped creature gets +1/+0 for each Gate you control and has vigilance and menace.
 SVar:X:Count$Valid Gate.YouCtrl
-S:Mode$ Continuous | Affected$ Gate.YouCtrl | AddPower$ X | AddKeyword$ Vigilance & Menace | Description$ Equipped creature gets +1/+0 for each Gate you control and has vigilance and menace.
-SVar:X:Count$Valid Gate.YouCtrl
 SVar:BuffedBy:Gate
 DeckHints:Type$Gate
 Oracle:Equipped creature gets +1/+0 for each Gate you control and has vigilance and menace. (A creature with menace can't be blocked except by two or more creatures.)\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/h/house_guildmage.txt b/forge-gui/res/cardsfolder/h/house_guildmage.txt
index ebfdeada89c..83077960509 100644
--- a/forge-gui/res/cardsfolder/h/house_guildmage.txt
+++ b/forge-gui/res/cardsfolder/h/house_guildmage.txt
@@ -3,5 +3,5 @@ ManaCost:U B
 Types:Creature Human Wizard
 PT:2/2
 A:AB$ Pump | Cost$ 1 U T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True | SpellDescription$ Target creature doesn't untap during its controller's next untap step.
-A:AB$ Surveil | Cost$ 2 B T | SurveilNum$ 2 | SpellDescription$ Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+A:AB$ Surveil | Cost$ 2 B T | Amount 2 | SpellDescription$ Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 Oracle:{1}{U}, {T}: Target creature doesn't untap during its controller's next untap step.\n{2}{B}, {T}: Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/i/invert_invent.txt b/forge-gui/res/cardsfolder/i/invert_invent.txt
index e317e2bbce3..9e5803db4e7 100644
--- a/forge-gui/res/cardsfolder/i/invert_invent.txt
+++ b/forge-gui/res/cardsfolder/i/invert_invent.txt
@@ -2,7 +2,7 @@ Name:Invert
 ManaCost:U/R
 Types:Instant
 AlternateMode: Split
-A:SP$ Pump | Cost$ U/R | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's power and toughness of each of CARDNAME. | SpellDescription$ Switch the power and toughness of each of up to two target creatures.
+A:SP$ Pump | Cost$ U/R | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch the power and toughness of each of up to two target creatures.
 Oracle:Switch the power and toughness of each of up to two target creatures.
 
 ALTERNATE
diff --git a/forge-gui/res/cardsfolder/l/league_guildmage.txt b/forge-gui/res/cardsfolder/l/league_guildmage.txt
index 01b6450215d..1c07ac501bf 100644
--- a/forge-gui/res/cardsfolder/l/league_guildmage.txt
+++ b/forge-gui/res/cardsfolder/l/league_guildmage.txt
@@ -4,4 +4,5 @@ Types:Creature Human Wizard
 PT:2/2
 A:AB$ Draw | Cost$ 3 U T | NumCards$ 1 | SpellDescription$ Draw a card.
 A:AB$ CopySpellAbility | Cost$ X R T | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TargetType$ Spell | SpellDescription$ Copy target instant or sorcery spell you control with converted mana cost X. You may choose new targets for the copy.
+SVar:X:Targeted$CardManaCost
 Oracle:{3}{U}, {T}: Draw a card.\n{X}{R}, {T}: Copy target instant or sorcery spell you control with converted mana cost X. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt b/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt
index e38563c5209..6382caaec7c 100644
--- a/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt
+++ b/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt
@@ -4,6 +4,6 @@ Types:Creature Cyclops
 PT:4/3
 K:Defender
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can attack as though it didn't have defender. | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as you've cast an instant or sorcery spell this turn, CARDNAME can attack as though it didn't have defender.
-SVar:X:Count$ThisTurnCast_Instant.YouOwn
+SVar:X:Count$ThisTurnCast_Instant.YouOwn,Sorcery.YouOwn
 SVar:BuffedBy:Instant,Sorcery
 Oracle:Defender\nAs long as you've cast an instant or sorcery spell this turn, Piston-Fist Cyclops can attack as though it didn't have defender.
diff --git a/forge-gui/res/cardsfolder/u/urban_utopia.txt b/forge-gui/res/cardsfolder/u/urban_utopia.txt
index a162ca7f0da..605d66f53b5 100644
--- a/forge-gui/res/cardsfolder/u/urban_utopia.txt
+++ b/forge-gui/res/cardsfolder/u/urban_utopia.txt
@@ -2,7 +2,7 @@ Name:Urban Utopia
 ManaCost:1 G
 Types:Enchantment Aura
 K:Enchant land
-A:SP$ Attach | Cost$ G | ValidTgts$ Land | AILogic$ Pump
+A:SP$ Attach | Cost$ 1 G | ValidTgts$ Land | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ FreeCard | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:FreeCard:DB$ Draw | Defined$ You | NumCards$ 1
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ AbundantGrowthTap | Description$ Enchanted land has "{T}: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/v/vigorspore_wurm.txt b/forge-gui/res/cardsfolder/v/vigorspore_wurm.txt
index 35007ee63e5..da010101d99 100644
--- a/forge-gui/res/cardsfolder/v/vigorspore_wurm.txt
+++ b/forge-gui/res/cardsfolder/v/vigorspore_wurm.txt
@@ -4,7 +4,7 @@ Types:Creature Wurm
 PT:6/4
 K:CantBeBlockedByAmount GT1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Undergrowth - When CARDNAME enters the battlefield, target creature gains vigilance and gets +X/+X until end of turn, where X is the number of creature cards in your graveyard.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | References$ X
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | KWs$ Vigilance | References$ X
 SVar:X:Count$TypeInYourYard.Creature
 SVar:PlayMain1:TRUE
 Oracle:Undergrowth — When Vigorspore Wurm enters the battlefield, target creature gains vigilance and gets +X/+X until end of turn, where X is the number of creature cards in your graveyard.\nVigorspore Wurm can't be blocked by more than one creature.