diff --git a/forge-gui/res/cardsfolder/y/yannik_scavenging_sentinel.txt b/forge-gui/res/cardsfolder/y/yannik_scavenging_sentinel.txt
index c79d904481a..f0181fbd837 100755
--- a/forge-gui/res/cardsfolder/y/yannik_scavenging_sentinel.txt
+++ b/forge-gui/res/cardsfolder/y/yannik_scavenging_sentinel.txt
@@ -6,13 +6,12 @@ K:Partner:Nikara, Lair Scavenger:Nikara
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters the battlefield, exile another creature you control until CARDNAME leaves the battlefield. When you do, distribute +1/+1 counters among any number of target creatures, where X is the exiled creature's power.
 SVar:TrigChoose:DB$ ChooseCard | Choices$ Creature.YouCtrl+Other | ChoiceZone$ Battlefield | ChoiceTitle$ Select another creature you control | Mandatory$ True | SubAbility$ DBExile
-SVar:DBExile:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Battlefield | Destination$ Exile | ExileParam$ Yannik | RememberLKI$ True | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | Triggers$ ComeBack | SVars$ TrigReturn | RememberObjects$ ChosenCard | ImprintCards$ Self | ForgetOnMoved$ Exile | Duration$ Permanent | SubAbility$ DBCleanup
+SVar:DBExile:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | Triggers$ ComeBack | SVars$ TrigReturn | RememberObjects$ ChosenCard | ImprintCards$ Self | ForgetOnMoved$ Exile | Duration$ Permanent | SubAbility$ DBImmediateTrigger
 SVar:ComeBack:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted | Execute$ TrigReturn | TriggerZones$ Command | TriggerController$ TriggeredCardController | Static$ True | TriggerDescription$ This creature is exiled until EFFECTSOURCE leaves the battlefield
 SVar:TrigReturn:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Exile | Destination$ Battlefield
-T:Mode$ Exiled | ValidPlayer$ You | CauseParam$ Yannik | Execute$ TrigPutCounters | Secondary$ True | TriggerDescription$ When you do, distribute X +1/+1 counters among any number of target creatures, where X is the exiled creature's power.
-SVar:TrigPutCounters:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature to distribute counters to | CounterType$ P1P1 | CounterNum$ X | TargetMin$ 1 | TargetMax$ X | DividedAsYouChoose$ X | References$ X | SubAbility$ DBCleanup2 | SpellDescription$ Distribute X +1/+1 counters among any number of target creatures.
+SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Execute$ TrigPutCounters | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | TriggerDescription$ When you do, distribute X +1/+1 counters among any number of target creatures, where X is the exiled creature's power.
+SVar:TrigPutCounters:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature to distribute counters to | CounterType$ P1P1 | CounterNum$ X | TargetMin$ 1 | TargetMax$ X | DividedAsYouChoose$ X | References$ X | SubAbility$ DBCleanup | SpellDescription$ Distribute X +1/+1 counters among any number of target creatures.
 SVar:X:RememberedLKI$CardPower
-SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-SVar:DBCleanup2:DB$ Cleanup | ClearRemembered$ True
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
 Oracle:Partner with Nikara, Lair Scavenger\nVigilance\nWhen Yannik, Scavenging Sentinel enters the battlefield, exile another creature you control until Yannik leaves the battlefield. When you do, distribute X +1/+1 counters among any number of target creatures, where X is the exiled creature's power.
diff --git a/forge-gui/res/quest/precons/Final Adventure.dck b/forge-gui/res/quest/precons/Final Adventure.dck
index 05da6219889..978a788b405 100644
--- a/forge-gui/res/quest/precons/Final Adventure.dck	
+++ b/forge-gui/res/quest/precons/Final Adventure.dck	
@@ -15,7 +15,7 @@ Image=final_adventure.jpg
 2 Disfigure|M20
 4 Edgewall Innkeeper|ELD
 1 Fabled Passage|ELD
-2 Find/Finality|GRN
+2 Find // Finality|GRN
 7 Forest|M20
 4 Foulmire Knight|ELD
 3 Jungle Hollow|M20
diff --git a/forge-gui/res/quest/precons/Nature's Vengeance.dck b/forge-gui/res/quest/precons/Nature's Vengeance.dck
index 670b63c11a2..4981322e223 100644
--- a/forge-gui/res/quest/precons/Nature's Vengeance.dck	
+++ b/forge-gui/res/quest/precons/Nature's Vengeance.dck	
@@ -29,7 +29,7 @@ Image=natures_vengeance.jpg
 1 Cultivate|C18
 1 Deathreap Ritual|C18
 1 Decimate|C18
-1 Emissary of Grudges|C18
+#1 Emissary of Grudges|C18
 1 Evolving Wilds|C18
 1 Explore|C18
 1 Explosive Vegetation|C18