diff --git a/forge-gui/res/cardsfolder/upcoming/aspiring_champion.txt b/forge-gui/res/cardsfolder/upcoming/aspiring_champion.txt
index f9cbfac3ce4..9409a3a7814 100644
--- a/forge-gui/res/cardsfolder/upcoming/aspiring_champion.txt
+++ b/forge-gui/res/cardsfolder/upcoming/aspiring_champion.txt
@@ -3,9 +3,12 @@ ManaCost:3 R
 Types:Creature Astartes Warrior
 PT:3/3
 K:Menace
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBPlay | TriggerDescription$ Lord of the Pyrrhian Legions — Whenever CARDNAME attacks, you may cast an artifact spell from your hand or graveyard by paying life equal to its mana value rather than paying its mana cost.
-SVar:TrigDig:AB$ DigUntil | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True | GainControl$ True | SubAbility$ DBDamage | RememberChanged$ True
-SVar:DBDamage:DB$ DamageAll | NumDmg$ X | ValidPlayers$ Player.Opponent | ConditionDefined$ Remembered | ConditionPresent$ Demon | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player |  Execute$ TrigSac | TriggerDescription$ Ruinous Ascension — When Aspiring Champion deals combat damage to a player, sacrifice it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield, then shuffle the rest into your library. If that creature is a Demon, it deals damage equal to its power to each opponent.
+SVar:TrigSac:DB$ Sacrifice | Defined$ Self | SubAbility$ TrigDig
+SVar:TrigDig:DB$ DigUntil | Valid$ Creature | ValidDescription$ creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True | GainControl$ True | SubAbility$ DBDamage | RememberFound$ True
+SVar:DBDamage:DB$ DamageAll | NumDmg$ X | ValidPlayers$ Player.Opponent | ConditionDefined$ Remembered | ConditionPresent$ Creature.Demon | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardPower
+DeckHints:Type$Demon
+DeckHas:Ability$Sacrifice
 Oracle:Menace\nRuinous Ascension — When Aspiring Champion deals combat damage to a player, sacrifice it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield, then shuffle the rest into your library. If that creature is a Demon, it deals damage equal to its power to each opponent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/canoptek_scarab_swarm.txt b/forge-gui/res/cardsfolder/upcoming/canoptek_scarab_swarm.txt
index 3a83b21f6c1..33c5fe807cd 100644
--- a/forge-gui/res/cardsfolder/upcoming/canoptek_scarab_swarm.txt
+++ b/forge-gui/res/cardsfolder/upcoming/canoptek_scarab_swarm.txt
@@ -4,9 +4,10 @@ Types:Artifact Creature Insect
 PT:1/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ Feeder Mandibles — When Canoptek Scarab Swarm enters the battlefield, exile target player’s graveyard. For each artifact or land card exiled this way, create a 1/1 colorless Insect artifact creature token with flying.
-SVar:TrigExile:DB$ ChangeZoneAll | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | SubAbility$ DBCounter | RememberChanged$ True
+SVar:TrigExile:DB$ ChangeZoneAll | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | SubAbility$ DBToken | RememberChanged$ True
 SVar:DBToken:DB$ Token | TokenAmount$ X | TokenScript$ c_1_1_insect_artifact_flying | TokenOwner$ You | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$Valid Land/+Y
+SVar:X:Remembered$Valid Land/.Y
 SVar:Y:Remembered$Valid Artifact
-Oracle:Flying, trample\nWhenever Bloodthirster deals combat damage to a player, untap it. After this combat phase, there is an additional combat phase.\nBloodthirster can’t attack a player it has already attacked this turn.
\ No newline at end of file
+DeckHas:Ability$Token
+Oracle:Flying\nFeeder Mandibles — When Canoptek Scarab Swarm enters the battlefield, exile target player’s graveyard. For each artifact or land card exiled this way, create a 1/1 colorless Insect artifact creature token with flying.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/canoptek_tomb_sentinel.txt b/forge-gui/res/cardsfolder/upcoming/canoptek_tomb_sentinel.txt
index b0f5be2e45d..895f7bb621b 100644
--- a/forge-gui/res/cardsfolder/upcoming/canoptek_tomb_sentinel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/canoptek_tomb_sentinel.txt
@@ -4,6 +4,7 @@ Types:Artifact Creature Insect
 PT:4/3
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ DBChangeZone | SpellDescription$ Exile Cannon — When CARDNAME Sentinel enters the battlefield from a graveyard, exile up to one target nonland permanent.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent | TargetMin$ 0 | TargetMax$ 1
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | TargetMin$ 0 | TargetMax$ 1
 K:Unearth:7
+DeckHas:Ability$Graveyard
 Oracle:Vigilance\nExile Cannon — When Canoptek Tomb Sentinel enters the battlefield from a graveyard, exile up to one target nonland permanent.\nUnearth {7} ({7}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)