diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
index 18f216f31b1..7de981a9c22 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
@@ -442,7 +442,7 @@ public class CountersPutAi extends CountersAi {
             }
         }
 
-        if ("AlwaysAtOppEOT".equals(logic)) {
+        if ("AtOppEOT".equals(logic)) {
             if (ph.is(PhaseType.END_OF_TURN) && ph.getNextTurn().equals(ai)) {
                 return true;
             }
diff --git a/forge-ai/src/main/java/forge/ai/ability/DestroyAllAi.java b/forge-ai/src/main/java/forge/ai/ability/DestroyAllAi.java
index 17701bc2d77..c643e0dacb2 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DestroyAllAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DestroyAllAi.java
@@ -148,7 +148,7 @@ public class DestroyAllAi extends SpellAbilityAi {
                 for (Card att : opponent.getCreaturesInPlay()) {
                     if (ComputerUtilCombat.canAttackNextTurn(att, ai)) {
                         combat.addAttacker(att, ai);
-                        containsAttacker = containsAttacker | opplist.contains(att);
+                        containsAttacker = containsAttacker || opplist.contains(att);
                     }
                 }
                 if (!containsAttacker) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/DigAi.java b/forge-ai/src/main/java/forge/ai/ability/DigAi.java
index 0bbb527bbb3..9ae979ce786 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DigAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DigAi.java
@@ -61,7 +61,7 @@ public class DigAi extends SpellAbilityAi {
 
         if ("Never".equals(sa.getParam("AILogic"))) {
             return false;
-        } else if ("AtOppEndOfTurn".equals(sa.getParam("AILogic"))) {
+        } else if ("AtOppEOT".equals(sa.getParam("AILogic"))) {
             if (!(game.getPhaseHandler().getNextTurn() == ai && game.getPhaseHandler().is(PhaseType.END_OF_TURN))) {
                 return false;
             }
diff --git a/forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java b/forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java
index 76cd8df5362..08a6c192914 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java
@@ -40,7 +40,7 @@ public class DigMultipleAi extends SpellAbilityAi {
 
         if ("Never".equals(sa.getParam("AILogic"))) {
             return false;
-        } else if ("AtOppEndOfTurn".equals(sa.getParam("AILogic"))) {
+        } else if ("AtOppEOT".equals(sa.getParam("AILogic"))) {
             if (!(game.getPhaseHandler().getNextTurn() == ai && game.getPhaseHandler().is(PhaseType.END_OF_TURN))) {
                 return false;
             }
diff --git a/forge-ai/src/main/java/forge/ai/ability/DrawAi.java b/forge-ai/src/main/java/forge/ai/ability/DrawAi.java
index 23f11a95dc6..9d7f339bf7e 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DrawAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DrawAi.java
@@ -140,7 +140,7 @@ public class DrawAi extends SpellAbilityAi {
             // LifeLessThan logic presupposes activation as soon as possible in an
             // attempt to save the AI from dying
             return true;
-        } else if (logic.equals("AlwaysAtOppEOT")) {
+        } else if (logic.equals("AtOppEOT")) {
             return ph.is(PhaseType.END_OF_TURN) && ph.getNextTurn().equals(ai);
         } else if (logic.equals("RespondToOwnActivation")) {
             return !ai.getGame().getStack().isEmpty() && ai.getGame().getStack().peekAbility().getHostCard().equals(sa.getHostCard());
diff --git a/forge-ai/src/main/java/forge/ai/ability/ManaEffectAi.java b/forge-ai/src/main/java/forge/ai/ability/ManaEffectAi.java
index c4abbd58167..1d17075d6c7 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ManaEffectAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ManaEffectAi.java
@@ -79,6 +79,8 @@ public class ManaEffectAi extends SpellAbilityAi {
     protected boolean checkPhaseRestrictions(Player ai, SpellAbility sa, PhaseHandler ph, String logic) {
         if (logic.startsWith("ManaRitual")) {
              return ph.is(PhaseType.MAIN2, ai) || ph.is(PhaseType.MAIN1, ai);
+        } else if ("AtOppEOT".equals(logic)) {
+            return ph.is(PhaseType.END_OF_TURN) && ph.getNextTurn() == ai;
         }
         return super.checkPhaseRestrictions(ai, sa, ph, logic);
     }
diff --git a/forge-gui/res/cardsfolder/a/animation_module.txt b/forge-gui/res/cardsfolder/a/animation_module.txt
index 6744d3d0a37..9dcfa071aab 100644
--- a/forge-gui/res/cardsfolder/a/animation_module.txt
+++ b/forge-gui/res/cardsfolder/a/animation_module.txt
@@ -3,7 +3,7 @@ ManaCost:1
 Types:Artifact
 T:Mode$ CounterAddedOnce | ValidCard$ Permanent.YouCtrl | TriggerZones$ Battlefield | CounterType$ P1P1 | Execute$ TrigToken | TriggerDescription$ Whenever one or more +1/+1 counters are put on a permanent you control, you may pay {1}. If you do, create a 1/1 colorless Servo artifact creature token.
 SVar:TrigToken:AB$ Token | Cost$ 1 | TokenAmount$ 1 | TokenScript$ c_1_1_a_servo | TokenOwner$ You | LegacyImage$ c 1 1 a servo kld
-A:AB$ PutCounter | Cost$ 3 T | ValidTgts$ Permanent,Player | TgtPrompt$ Select target player or permanent | CounterType$ ExistingCounter | CounterNum$ 1 | AILogic$ AlwaysAtOppEOT | SpellDescription$ Choose a counter on target permanent or player. Give that permanent or player another counter of that kind.
+A:AB$ PutCounter | Cost$ 3 T | ValidTgts$ Permanent,Player | TgtPrompt$ Select target player or permanent | CounterType$ ExistingCounter | CounterNum$ 1 | AILogic$ AtOppEOT | SpellDescription$ Choose a counter on target permanent or player. Give that permanent or player another counter of that kind.
 DeckHints:Ability$Counters
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/animation_module.jpg
diff --git a/forge-gui/res/cardsfolder/a/arch_of_orazca.txt b/forge-gui/res/cardsfolder/a/arch_of_orazca.txt
index c27560e1810..cdf8f8cf6a4 100644
--- a/forge-gui/res/cardsfolder/a/arch_of_orazca.txt
+++ b/forge-gui/res/cardsfolder/a/arch_of_orazca.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Land
 K:Ascend
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Draw | Cost$ 5 T | NumCards$ 1 | Activation$ Blessing | AILogic$ AlwaysAtOppEOT | SpellDescription$ Draw a card. Activate only if you have the city's blessing.
+A:AB$ Draw | Cost$ 5 T | NumCards$ 1 | Activation$ Blessing | AILogic$ AtOppEOT | SpellDescription$ Draw a card. Activate only if you have the city's blessing.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arch_of_orazca.jpg
 Oracle:Ascend (If you control ten or more permanents, you get the city's blessing for the rest of the game.)\n{T}: Add {C}.\n{5}, {T}: Draw a card. Activate only if you have the city's blessing.
diff --git a/forge-gui/res/cardsfolder/a/azami_lady_of_scrolls.txt b/forge-gui/res/cardsfolder/a/azami_lady_of_scrolls.txt
index aa6f5c1997c..7c2235148cf 100644
--- a/forge-gui/res/cardsfolder/a/azami_lady_of_scrolls.txt
+++ b/forge-gui/res/cardsfolder/a/azami_lady_of_scrolls.txt
@@ -2,7 +2,7 @@ Name:Azami, Lady of Scrolls
 ManaCost:2 U U U
 Types:Legendary Creature Human Wizard
 PT:0/2
-A:AB$ Draw | Cost$ tapXType<1/Wizard> | NumCards$ 1 | AILogic$ AlwaysAtOppEOT | SpellDescription$ Draw a card.
+A:AB$ Draw | Cost$ tapXType<1/Wizard> | NumCards$ 1 | AILogic$ AtOppEOT | SpellDescription$ Draw a card.
 AI:RemoveDeck:Random
 DeckHints:Type$Wizard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azami_lady_of_scrolls.jpg
diff --git a/forge-gui/res/cardsfolder/c/consulate_turret.txt b/forge-gui/res/cardsfolder/c/consulate_turret.txt
index 5ee544139e4..68ddf2adc96 100644
--- a/forge-gui/res/cardsfolder/c/consulate_turret.txt
+++ b/forge-gui/res/cardsfolder/c/consulate_turret.txt
@@ -1,7 +1,7 @@
 Name:Consulate Turret
 ManaCost:3
 Types:Artifact
-A:AB$ PutCounter | Cost$ T | Defined$ You | CounterType$ ENERGY | CounterNum$ 1 | AILogic$ AlwaysAtOppEOT | SpellDescription$ You get {E} (an energy counter).
+A:AB$ PutCounter | Cost$ T | Defined$ You | CounterType$ ENERGY | CounterNum$ 1 | AILogic$ AtOppEOT | SpellDescription$ You get {E} (an energy counter).
 A:AB$ DealDamage | Cost$ T PayEnergy<3> | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target player or planeswalker.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/consulate_turret.jpg
 Oracle:{T}: You get {E} (an energy counter).\n{T}, Pay {E}{E}{E}: Consulate Turret deals 2 damage to target player or planeswalker.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/fabrication_module.txt b/forge-gui/res/cardsfolder/f/fabrication_module.txt
index 1555f0e9c08..3e703549e91 100644
--- a/forge-gui/res/cardsfolder/f/fabrication_module.txt
+++ b/forge-gui/res/cardsfolder/f/fabrication_module.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact
 T:Mode$ CounterAddedOnce | ValidPlayer$ You | TriggerZones$ Battlefield | CounterType$ ENERGY | Execute$ TrigPutCounter | TriggerDescription$ Whenever you get one or more {E} (energy counters), put a +1/+1 counter on target creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ PutCounter | Cost$ 4 T | Defined$ You | CounterType$ ENERGY | CounterNum$ 1 | AILogic$ AlwaysAtOppEOT | SpellDescription$ You get {E}.
+A:AB$ PutCounter | Cost$ 4 T | Defined$ You | CounterType$ ENERGY | CounterNum$ 1 | AILogic$ AtOppEOT | SpellDescription$ You get {E}.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fabrication_module.jpg
 Oracle:Whenever you get one or more {E} (energy counters), put a +1/+1 counter on target creature you control.\n{4}, {T}: You get {E}.
diff --git a/forge-gui/res/cardsfolder/h/hatchery_spider.txt b/forge-gui/res/cardsfolder/h/hatchery_spider.txt
index aa6137ccdad..8e99ff39b82 100644
--- a/forge-gui/res/cardsfolder/h/hatchery_spider.txt
+++ b/forge-gui/res/cardsfolder/h/hatchery_spider.txt
@@ -4,6 +4,6 @@ Types:Creature Spider
 PT:5/7
 K:Reach
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Undergrowth - When you cast this spell, reveal the top X cards of your library, where X is the number of creature cards in your graveyard. You may put a green permanent card with mana value X or less from among them onto the battlefield. Put the rest on the bottom of your library in a random order.
-SVar:TrigDig:DB$ Dig | DigNum$ X | Reveal$ True | ChangeNum$ 1 | ChangeValid$ Permanent.Green+cmcLEX | DestinationZone$ Battlefield | AILogic$ AtOppEndOfTurn | Optional$ True | RestRandomOrder$ True
+SVar:TrigDig:DB$ Dig | DigNum$ X | Reveal$ True | ChangeNum$ 1 | ChangeValid$ Permanent.Green+cmcLEX | DestinationZone$ Battlefield | AILogic$ AtOppEOT | Optional$ True | RestRandomOrder$ True
 SVar:X:Count$TypeInYourYard.Creature
 Oracle:Reach\nUndergrowth — When you cast this spell, reveal the top X cards of your library, where X is the number of creature cards in your graveyard. You may put a green permanent card with mana value X or less from among them onto the battlefield. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/k/kumena_tyrant_of_orazca.txt b/forge-gui/res/cardsfolder/k/kumena_tyrant_of_orazca.txt
index f0629ec7537..3e88bb16cc2 100644
--- a/forge-gui/res/cardsfolder/k/kumena_tyrant_of_orazca.txt
+++ b/forge-gui/res/cardsfolder/k/kumena_tyrant_of_orazca.txt
@@ -3,7 +3,7 @@ ManaCost:1 G U
 Types:Legendary Creature Merfolk Shaman
 PT:2/4
 A:AB$ Pump | Cost$ tapXType<1/Merfolk.Other> | CostDesc$ Tap another untapped Merfolk you control: | Defined$ Self | KW$ HIDDEN Unblockable | AILogic$ BeforeCombat | SpellDescription$ CARDNAME can't be blocked this turn.
-A:AB$ Draw | Cost$ tapXType<3/Merfolk> | CostDesc$ Tap three untapped Merfolk you control: | NumCards$ 1 | AILogic$ AlwaysAtOppEOT | SpellDescription$ Draw a card.
+A:AB$ Draw | Cost$ tapXType<3/Merfolk> | CostDesc$ Tap three untapped Merfolk you control: | NumCards$ 1 | AILogic$ AtOppEOT | SpellDescription$ Draw a card.
 A:AB$ PutCounterAll | Cost$ tapXType<5/Merfolk> | CostDesc$ Tap five untapped Merfolk you control: | ValidCards$ Merfolk.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | AILogic$ AtOppEOT | SpellDescription$ Put a +1/+1 counter on each Merfolk you control.
 DeckHints:Type$Merfolk
 SVar:BuffedBy:Merfolk
diff --git a/forge-gui/res/cardsfolder/m/muzzio_visionary_architect.txt b/forge-gui/res/cardsfolder/m/muzzio_visionary_architect.txt
index 7be8233860c..895713e74bd 100644
--- a/forge-gui/res/cardsfolder/m/muzzio_visionary_architect.txt
+++ b/forge-gui/res/cardsfolder/m/muzzio_visionary_architect.txt
@@ -2,7 +2,7 @@ Name:Muzzio, Visionary Architect
 ManaCost:1 U U
 Types:Legendary Creature Human Artificer
 PT:1/3
-A:AB$ Dig | Cost$ 3 U T | DigNum$ X | Optional$ True | ChangeValid$ Artifact | DestinationZone$ Battlefield | AILogic$ AtOppEndOfTurn | SpellDescription$ Look at the top X cards of your library, where X is the highest mana value among artifacts you control. You may put an artifact card from among them onto the battlefield. Put the rest on the bottom of your library in any order.
+A:AB$ Dig | Cost$ 3 U T | DigNum$ X | Optional$ True | ChangeValid$ Artifact | DestinationZone$ Battlefield | AILogic$ AtOppEOT | SpellDescription$ Look at the top X cards of your library, where X is the highest mana value among artifacts you control. You may put an artifact card from among them onto the battlefield. Put the rest on the bottom of your library in any order.
 SVar:X:Count$HighestCMC_Artifact.YouCtrl+inZoneBattlefield
 SVar:Picture:http://www.wizards.com/global/images/magic/general/muzzio_visionary_architect.jpg
 Oracle:{3}{U}, {T}: Look at the top X cards of your library, where X is the highest mana value among artifacts you control. You may put an artifact card from among them onto the battlefield. Put the rest on the bottom of your library in any order.
diff --git a/forge-gui/res/cardsfolder/m/mystic_archaeologist.txt b/forge-gui/res/cardsfolder/m/mystic_archaeologist.txt
index 4bf64a9b5d0..190459817c9 100644
--- a/forge-gui/res/cardsfolder/m/mystic_archaeologist.txt
+++ b/forge-gui/res/cardsfolder/m/mystic_archaeologist.txt
@@ -1,6 +1,6 @@
 Name:Mystic Archaeologist
 ManaCost:1 U
 Types:Creature Human Wizard
-A:AB$ Draw | Cost$ 3 U U | Defined$ You | NumCards$ 2 | AILogic$ AlwaysAtOppEOT | SpellDescription$ Draw two cards.
+A:AB$ Draw | Cost$ 3 U U | Defined$ You | NumCards$ 2 | AILogic$ AtOppEOT | SpellDescription$ Draw two cards.
 Oracle:{3}{U}{U}: Draw two cards.
 PT:2/1
diff --git a/forge-gui/res/cardsfolder/n/niv_mizzet_the_firemind.txt b/forge-gui/res/cardsfolder/n/niv_mizzet_the_firemind.txt
index 87f848d8433..8e87244e1b5 100644
--- a/forge-gui/res/cardsfolder/n/niv_mizzet_the_firemind.txt
+++ b/forge-gui/res/cardsfolder/n/niv_mizzet_the_firemind.txt
@@ -3,7 +3,7 @@ ManaCost:2 U U R R
 Types:Legendary Creature Dragon Wizard
 PT:4/4
 K:Flying
-A:AB$ Draw | Cost$ T | NumCards$ 1 | AILogic$ AlwaysAtOppEOT | SpellDescription$ Draw a card.
+A:AB$ Draw | Cost$ T | NumCards$ 1 | AILogic$ AtOppEOT | SpellDescription$ Draw a card.
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you draw a card, CARDNAME deals 1 damage to any target.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/niv_mizzet_the_firemind.jpg
diff --git a/forge-gui/res/cardsfolder/p/pristine_talisman.txt b/forge-gui/res/cardsfolder/p/pristine_talisman.txt
index 0468d2739dd..d14cfd0f7d2 100644
--- a/forge-gui/res/cardsfolder/p/pristine_talisman.txt
+++ b/forge-gui/res/cardsfolder/p/pristine_talisman.txt
@@ -1,7 +1,7 @@
 Name:Pristine Talisman
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SubAbility$ DBGainLife | SpellDescription$ Add {C}. You gain 1 life.
+A:AB$ Mana | Cost$ T | Produced$ C | SubAbility$ DBGainLife | AILogic$ AtOppEOT | SpellDescription$ Add {C}. You gain 1 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pristine_talisman.jpg
 Oracle:{T}: Add {C}. You gain 1 life.
diff --git a/forge-gui/res/cardsfolder/s/spectral_sailor.txt b/forge-gui/res/cardsfolder/s/spectral_sailor.txt
index e045469fdca..9b252402aeb 100644
--- a/forge-gui/res/cardsfolder/s/spectral_sailor.txt
+++ b/forge-gui/res/cardsfolder/s/spectral_sailor.txt
@@ -4,5 +4,5 @@ Types:Creature Spirit Pirate
 PT:1/1
 K:Flash
 K:Flying
-A:AB$ Draw | Cost$ 3 U | NumCards$ 1 | Defined$ You | AILogic$ AlwaysAtOppEOT | SpellDescription$ Draw a card.
+A:AB$ Draw | Cost$ 3 U | NumCards$ 1 | Defined$ You | AILogic$ AtOppEOT | SpellDescription$ Draw a card.
 Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying\n{3}{U}: Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/strixhaven_stadium.txt b/forge-gui/res/cardsfolder/s/strixhaven_stadium.txt
index e6e9130aea7..e73f2be1394 100644
--- a/forge-gui/res/cardsfolder/s/strixhaven_stadium.txt
+++ b/forge-gui/res/cardsfolder/s/strixhaven_stadium.txt
@@ -1,7 +1,7 @@
 Name:Strixhaven Stadium
 ManaCost:3
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ C | SubAbility$ DBPutCounter | SpellDescription$ Add {C}. Put a point counter on CARDNAME.
+A:AB$ Mana | Cost$ T | Produced$ C | SubAbility$ DBPutCounter | AILogic$ AtOppEOT | SpellDescription$ Add {C}. Put a point counter on CARDNAME.
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ POINT | CounterNum$ 1
 T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ You | CombatDamage$ True | Execute$ TrigRemove | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature deals combat damage to you, remove a point counter from CARDNAME.
 SVar:TrigRemove:DB$ RemoveCounter | Defined$ Self | CounterType$ POINT | CounterNum$ 1
diff --git a/forge-gui/res/cardsfolder/t/the_great_henge.txt b/forge-gui/res/cardsfolder/t/the_great_henge.txt
index d2900681ce2..f7c9948cefc 100644
--- a/forge-gui/res/cardsfolder/t/the_great_henge.txt
+++ b/forge-gui/res/cardsfolder/t/the_great_henge.txt
@@ -3,7 +3,7 @@ ManaCost:7 G G
 Types:Legendary Artifact
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ CARDNAME costs {X} less to cast, where X is the greatest power among creatures you control.
 SVar:X:Count$GreatestPower_Creature.YouCtrl
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SubAbility$ DBGainLife | SpellDescription$ Add {G}{G}. You gain 2 life.
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SubAbility$ DBGainLife | AILogic$ AtOppEOT | SpellDescription$ Add {G}{G}. You gain 2 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, put a +1/+1 counter on it and draw a card.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
diff --git a/forge-gui/res/cardsfolder/t/treasure_trove.txt b/forge-gui/res/cardsfolder/t/treasure_trove.txt
index 38afce2b22f..0f4817de58d 100644
--- a/forge-gui/res/cardsfolder/t/treasure_trove.txt
+++ b/forge-gui/res/cardsfolder/t/treasure_trove.txt
@@ -1,7 +1,7 @@
 Name:Treasure Trove
 ManaCost:2 U U
 Types:Enchantment
-A:AB$ Draw | Cost$ 2 U U | NumCards$ 1 | AILogic$ AlwaysAtOppEOT | SpellDescription$ Draw a card.
+A:AB$ Draw | Cost$ 2 U U | NumCards$ 1 | AILogic$ AtOppEOT | SpellDescription$ Draw a card.
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treasure_trove.jpg
 Oracle:{2}{U}{U}: Draw a card.
diff --git a/forge-gui/res/cardsfolder/v/viviens_arkbow.txt b/forge-gui/res/cardsfolder/v/viviens_arkbow.txt
index 79860e04052..6f9990236c1 100644
--- a/forge-gui/res/cardsfolder/v/viviens_arkbow.txt
+++ b/forge-gui/res/cardsfolder/v/viviens_arkbow.txt
@@ -1,6 +1,6 @@
 Name:Vivien's Arkbow
 ManaCost:1 G
 Types:Legendary Artifact
-A:AB$ Dig | Cost$ X T Discard<1/Card> | DigNum$ X | AILogic$ AtOppEndOfTurn | Optional$ True | Reveal$ False | ChangeNum$ 1 | ChangeValid$ Creature.cmcLEX | DestinationZone$ Battlefield | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True | SpellDescription$ Look at the top X cards of your library. You may put a creature card with mana value X or less from among them onto the battlefield. Put the rest on the bottom of your library in a random order.
+A:AB$ Dig | Cost$ X T Discard<1/Card> | DigNum$ X | AILogic$ AtOppEOT | Optional$ True | Reveal$ False | ChangeNum$ 1 | ChangeValid$ Creature.cmcLEX | DestinationZone$ Battlefield | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True | SpellDescription$ Look at the top X cards of your library. You may put a creature card with mana value X or less from among them onto the battlefield. Put the rest on the bottom of your library in a random order.
 SVar:X:Count$xPaid
 Oracle:{X}, {T}, Discard a card: Look at the top X cards of your library. You may put a creature card with mana value X or less from among them onto the battlefield. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/w/whispers_of_the_muse.txt b/forge-gui/res/cardsfolder/w/whispers_of_the_muse.txt
index 3e86631e731..a104412c1bc 100644
--- a/forge-gui/res/cardsfolder/w/whispers_of_the_muse.txt
+++ b/forge-gui/res/cardsfolder/w/whispers_of_the_muse.txt
@@ -1,7 +1,7 @@
 Name:Whispers of the Muse
 ManaCost:U
 Types:Instant
-A:SP$ Draw | Cost$ U | NumCards$ 1 | AILogic$ AlwaysAtOppEOT | SpellDescription$ Draw a card.
+A:SP$ Draw | Cost$ U | NumCards$ 1 | AILogic$ AtOppEOT | SpellDescription$ Draw a card.
 K:Buyback:5
 SVar:Picture:http://www.wizards.com/global/images/magic/general/whispers_of_the_muse.jpg
 Oracle:Buyback {5} (You may pay an additional {5} as you cast this spell. If you do, put this card into your hand as it resolves.)\nDraw a card.