diff --git a/forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java
index 6a6f4c83471..c79d87dae2f 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java
@@ -45,8 +45,8 @@ public class UntapAllEffect extends SpellAbilityEffect {
                 untapper = c.getController();
             }
             if (c.untap(true))  {
-                    untapMap.computeIfAbsent(untapper, i -> new CardCollection()).add(c);
-                    if (sa.hasParam("RememberUntapped")) card.addRemembered(c);
+                untapMap.computeIfAbsent(untapper, i -> new CardCollection()).add(c);
+                if (sa.hasParam("RememberUntapped")) card.addRemembered(c);
 
             }
         }
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 6a3633348c9..69aeafa08d9 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -1290,7 +1290,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
                 craft.setExiledBy(cause.getActivatingPlayer());
             }
         }
-
     }
 
     public final List<Integer> getStoredRolls() {
diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java
index 409b7c5606b..4e6092fd82e 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -244,7 +244,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         }
 
         if (sp.isManaAbility()) { // Mana Abilities go straight through
-            if (!sp.isCopied()) {
+            if (!sp.isCopied() && !sp.isTrigger()) {
                 // Copied abilities aren't activated, so they shouldn't change these values
                 source.addAbilityActivated(sp);
             }
@@ -320,7 +320,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             return;
         }
 
-        if (sp.isAbility() && !sp.isCopied()) {
+        if (sp.isAbility() && !sp.isCopied() && !sp.isTrigger()) {
             source.addAbilityActivated(sp);
         }
 
diff --git a/forge-gui/res/cardsfolder/r/river_herald_guide.txt b/forge-gui/res/cardsfolder/r/river_herald_guide.txt
index ad10aaf84ce..583217c659b 100644
--- a/forge-gui/res/cardsfolder/r/river_herald_guide.txt
+++ b/forge-gui/res/cardsfolder/r/river_herald_guide.txt
@@ -2,7 +2,7 @@ Name:River Herald Guide
 ManaCost:2 G
 Types:Creature Merfolk Scout
 PT:3/1
-K:Viligance
+K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExplore | TriggerDescription$ When CARDNAME enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back on top or into your graveyard.)
 SVar:TrigExplore:DB$ Explore
 DeckHas:Ability$Counters
diff --git a/forge-gui/src/main/java/forge/interfaces/IGameController.java b/forge-gui/src/main/java/forge/interfaces/IGameController.java
index add0d69533c..4367ca77bb2 100644
--- a/forge-gui/src/main/java/forge/interfaces/IGameController.java
+++ b/forge-gui/src/main/java/forge/interfaces/IGameController.java
@@ -30,8 +30,7 @@ public interface IGameController {
 
     void selectPlayer(PlayerView playerView, ITriggerEvent triggerEvent);
 
-    boolean selectCard(CardView cardView,
-            List<CardView> otherCardViewsToSelect, ITriggerEvent triggerEvent);
+    boolean selectCard(CardView cardView, List<CardView> otherCardViewsToSelect, ITriggerEvent triggerEvent);
 
     void selectAbility(SpellAbilityView sa);
 
diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
index 78933606020..c09d9dea41b 100644
--- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java
+++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
@@ -413,7 +413,6 @@ public class HumanCostDecision extends CostDecisionMakerBase {
         final CardCollection exiled = new CardCollection();
         final String required = sharedType ? " (must share a card type)" : "";
 
-
         final List<Card> chosen = controller.chooseCardsForZoneChange(ZoneType.Exile, origin, ability, typeList,
                 mandatory ? nNeeded : 0, nNeeded, null, cost.toString(nNeeded) + required,
                 null);