diff --git a/forge-gui/res/cardsfolder/upcoming/citanul_stalwart.txt b/forge-gui/res/cardsfolder/upcoming/citanul_stalwart.txt
index f98ee45d7a6..3fb5e10f143 100644
--- a/forge-gui/res/cardsfolder/upcoming/citanul_stalwart.txt
+++ b/forge-gui/res/cardsfolder/upcoming/citanul_stalwart.txt
@@ -2,6 +2,6 @@ Name:Citanul Stalwart
 ManaCost:G
 Types:Creature Elf Druid Soldier
 PT:1/1
-A:AB$ Mana | Cost$ T tapXType<1/Creature;Artifact> | Produced$ Any | SpellDescription$ Add one mana of any color.
+A:AB$ Mana | Cost$ T tapXType<1/Creature;Artifact/artifact or creature> | Produced$ Any | SpellDescription$ Add one mana of any color.
 DeckHints:Type$Artifact
 Oracle:{T}, Tap an untapped artifact or creature you control: Add one mana of any color.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/coastal_bulwark.txt b/forge-gui/res/cardsfolder/upcoming/coastal_bulwark.txt
index 5701169db9f..5b5fa34344d 100644
--- a/forge-gui/res/cardsfolder/upcoming/coastal_bulwark.txt
+++ b/forge-gui/res/cardsfolder/upcoming/coastal_bulwark.txt
@@ -5,6 +5,6 @@ PT:1/3
 K:Defender
 S:Mode$ Continuous | Affected$ Card.Self | IsPresent$ Island.YouCtrl | AddPower$ 2 | Description$ CARDNAME gets +2/+0 as long as you control an Island.
 A:AB$ Surveil | Cost$ 2 T | Amount$ 1 | SpellDescription$ Surveil 1. (To surveil 1, look at the top card of your library. You may put that card into your graveyard.)
-DeckHas:Ability$Graveyard
+DeckHints:Ability$Graveyard
 SVar:BuffedBy:Island
 Oracle:Defender\nCoastal Bulwark gets +2/+0 as long as you control an Island.\n{2}, {T}: Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/defabricate.txt b/forge-gui/res/cardsfolder/upcoming/defabricate.txt
index 90a05f787a7..21cf9c94b46 100644
--- a/forge-gui/res/cardsfolder/upcoming/defabricate.txt
+++ b/forge-gui/res/cardsfolder/upcoming/defabricate.txt
@@ -3,5 +3,5 @@ ManaCost:1 U
 Types:Instant
 A:SP$ Charm | Choices$ DBCounter,DBStile
 SVar:DBCounter:DB$ Counter | TargetType$ Spell | TgtPrompt$ Select target artifact or enchantment spell | ValidTgts$ Artifact,Enchantment | Destination$ Exile | SpellDescription$ Counter target artifact or enchantment spell. If a spell is countered this way, exile it instead of putting it into its owner's graveyard.
-SVar:DBStile:DB$ Counter | TgtPrompt$ Choose target ability | ValidTgts$ Card,Emblem | TargetType$ Activated,Triggered | SpellDescription$ Counter target activated or triggered ability.
+SVar:DBStile:DB$ Counter | TgtPrompt$ Select target activated or triggered ability | ValidTgts$ Card,Emblem | TargetType$ Activated,Triggered | SpellDescription$ Counter target activated or triggered ability.
 Oracle:Choose one —\n• Counter target artifact or enchantment spell. If a spell is countered this way, exile it instead of putting it into its owner's graveyard.\n• Counter target activated or triggered ability.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/demolition_field.txt b/forge-gui/res/cardsfolder/upcoming/demolition_field.txt
index 0ddbbec33d2..5cee41130f6 100644
--- a/forge-gui/res/cardsfolder/upcoming/demolition_field.txt
+++ b/forge-gui/res/cardsfolder/upcoming/demolition_field.txt
@@ -4,7 +4,7 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | Cost$ 2 T Sac<1/CARDNAME> | ValidTgts$ Land.nonBasic+OppCtrl | TgtPrompt$ Select target nonbasic land an opponent controls | SubAbility$ DBSearch | AILogic$ GhostQuarter | SpellDescription$ Destroy target nonbasic land an opponent controls. That land's controller may search their library for a basic land card, put it onto the battlefield, then shuffle. You may search your library for a basic land card, put it onto the battlefield, then shuffle.
 SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ TargetedController | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbiliy$ DBSearchYou | StackDescription$ That land's controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
-SVar:DBSearchYou:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | StackDescription$ You may search your library for a basic land card, put it onto the battlefield, then shuffle.
+SVar:DBSearchYou:DB$ ChangeZone | Origin$ Library | | DefinedPlayer$ You | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | StackDescription$ You may search your library for a basic land card, put it onto the battlefield, then shuffle.
 AI:RemoveDeck:Random
 DeckHas:Ability$Sacrifice
 Oracle:{T}: Add {C}.\n{2}, {T}, Sacrifice Demolition Field: Destroy target nonbasic land an opponent controls. That land's controller may search their library for a basic land card, put it onto the battlefield, then shuffle. You may search your library for a basic land card, put it onto the battlefield, then shuffle.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/desynchronize.txt b/forge-gui/res/cardsfolder/upcoming/desynchronize.txt
index 7ad09918e58..b6d236bb52d 100644
--- a/forge-gui/res/cardsfolder/upcoming/desynchronize.txt
+++ b/forge-gui/res/cardsfolder/upcoming/desynchronize.txt
@@ -1,6 +1,6 @@
 Name:Desynchronize
 ManaCost:4 U
 Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Permanent.nonLand | SubAbility$ DBScry | TgtPrompt$ Select target nonland permanent for its owner to put on the top or bottom of their library | AlternativeDecider$ TargetedOwner | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | DestinationAlternative$ Library | LibraryPositionAlternative$ -1 | AlternativeDestinationMessage$ Would you like to put the card on the top of your library (and not on the bottom)? | SpellDescription$ Target nonland permanent’s owner puts it on the top or bottom of their library. Scry 2.
+A:SP$ ChangeZone | ValidTgts$ Permanent.nonLand | SubAbility$ DBScry | TgtPrompt$ Select target nonland permanent | AlternativeDecider$ TargetedOwner | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | DestinationAlternative$ Library | LibraryPositionAlternative$ -1 | AlternativeDestinationMessage$ Would you like to put the card on the top of your library (and not on the bottom)? | SpellDescription$ Target nonland permanent's owner puts it on the top or bottom of their library. Scry 2.
 SVar:DBScry:DB$ Scry | ScryNum$ 2
-Oracle:Target nonland permanent's owner puts it on the top or bottom of their library. Scry 2
\ No newline at end of file
+Oracle:Target nonland permanent's owner puts it on the top or bottom of their library. Scry 2.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/disciples_of_gix.txt b/forge-gui/res/cardsfolder/upcoming/disciples_of_gix.txt
index 2f9dd78b443..16fb1184411 100644
--- a/forge-gui/res/cardsfolder/upcoming/disciples_of_gix.txt
+++ b/forge-gui/res/cardsfolder/upcoming/disciples_of_gix.txt
@@ -3,7 +3,6 @@ ManaCost:4 B B
 Types:Creature Phyrexian Human
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, search your library for up to three artifact cards, put them into your graveyard, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Artifact.YouOwn | ChangeNum$ 3 | StackDescription$ Search your library for up to three creature cards, put them into your graveyard, then shuffle.
-DeckHas:Ability$Graveyard
-DeckNeeds:Type$Artifact
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Artifact.YouOwn | ChangeNum$ 3
+DeckNeeds:Type$Artifact & Ability$Graveyard
 Oracle:When Disciples of Gix enters the battlefield, search your library for up to three artifact cards, put them into your graveyard, then shuffle.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/emergency_weld.txt b/forge-gui/res/cardsfolder/upcoming/emergency_weld.txt
index d4a14979dbe..a188874d451 100644
--- a/forge-gui/res/cardsfolder/upcoming/emergency_weld.txt
+++ b/forge-gui/res/cardsfolder/upcoming/emergency_weld.txt
@@ -1,7 +1,7 @@
 Name:Emergency Weld
 ManaCost:1 B
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target artifact or creature card in your graveyard | ValidTgts$ Artifact.YouOwn,Creature.YouOwn | SubAbility$ DBToken | SpellDescription$ Return target artifact or creature card from your graveyard to your hand. Create a 1/1 colorless Soldier artifact creature token.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_soldier
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target artifact or creature card in your graveyard | ValidTgts$ Artifact.YouOwn,Creature.YouOwn | SubAbility$ DBToken | SpellDescription$ Return target artifact or creature card from your graveyard to your hand.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_soldier | SpellDescription$ Create a 1/1 colorless Soldier artifact creature token.
 DeckHas:Ability$Token|Graveyard & Type$Artifact|Soldier
 Oracle:Return target artifact or creature card from your graveyard to your hand. Create a 1/1 colorless Soldier artifact creature token.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/evangel_of_synthesis.txt b/forge-gui/res/cardsfolder/upcoming/evangel_of_synthesis.txt
index 15a6e0ff14f..f389999514c 100644
--- a/forge-gui/res/cardsfolder/upcoming/evangel_of_synthesis.txt
+++ b/forge-gui/res/cardsfolder/upcoming/evangel_of_synthesis.txt
@@ -4,7 +4,7 @@ Types:Creature Phyrexian Human Cleric
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card, then discard a card.
 SVar:TrigDraw:DB$ Draw | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose | SubAbility$ DBPutCounter
+SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose
 S:Mode$ Continuous | Affected$ Card.Self | CheckSVar$ X | SVarCompare$ GE2 | AddPower$ 1 | AddKeyword$ Menace | Description$ As long as you've drawn two or more cards this turn, CARDNAME gets +1/+0 and has menace.
 SVar:X:Count$YouDrewThisTurn
 DeckHas:Ability$Discard & Keyword$Menace
diff --git a/forge-gui/res/cardsfolder/upcoming/fallaji_archeologist.txt b/forge-gui/res/cardsfolder/upcoming/fallaji_archeologist.txt
index 2786635fd80..f68aee742f8 100644
--- a/forge-gui/res/cardsfolder/upcoming/fallaji_archeologist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/fallaji_archeologist.txt
@@ -7,5 +7,6 @@ SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You | RememberMilled$ True | Sub
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Card.nonCreature+nonLand+YouOwn+IsRemembered | RememberChanged$ True | ForgetOtherRemembered$ True | Hidden$ True | Optional$ True | SubAbility$ DBCounter
 SVar:DBCounter:DB$ PutCounter | Defined$ Card.Self | CounterType$ P1P1 | ConditionDefined$ Remembered | ConditionNotPresent$ Card | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Graveyard|Mill|Counters
+DeckHas:Ability$Mill|Counters
+DeckHints:Ability$Graveyard
 Oracle:When Fallaji Archaeologist enters the battlefield, mill three cards. You may put a noncreature, nonland card from among the cards milled this way into your hand. If you don't, put a +1/+1 counter on Fallaji Archaeologist. (To mill a card, put the top card of your library into your graveyard.)
\ No newline at end of file