diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
index 901b7d99ee7..2af4685a09e 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
@@ -1464,8 +1464,10 @@ public class ComputerUtilCard {
         
         if (isBerserk) {
             // if we got here, Berserk will result in the pumped creature dying at EOT and the opponent will not lose
+            // (other similar cards with AILogic$ Berserk that do not die only when attacking are excluded from consideration)
             if (ai.getController() instanceof PlayerControllerAi) {
-                boolean aggr = ((PlayerControllerAi)ai.getController()).getAi().getBooleanProperty(AiProps.USE_BERSERK_AGGRESSIVELY);
+                boolean aggr = ((PlayerControllerAi)ai.getController()).getAi().getBooleanProperty(AiProps.USE_BERSERK_AGGRESSIVELY)
+                        || (sa.getHostCard() != null && !sa.getHostCard().getName().equals("Berserk"));
                 if (!aggr) {
                     return false;
                 }
diff --git a/forge-gui/res/cardsfolder/s/salvage.txt b/forge-gui/res/cardsfolder/s/salvage.txt
index 934e2e37d55..e9763d1941d 100644
--- a/forge-gui/res/cardsfolder/s/salvage.txt
+++ b/forge-gui/res/cardsfolder/s/salvage.txt
@@ -2,6 +2,5 @@ Name:Salvage
 ManaCost:G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ G | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | TgtPrompt$ Choose target card in your graveyard | ValidTgts$ Card.YouCtrl | SpellDescription$ Put target card from your graveyard on top of your library.
-SVar:RemAIDeck:True
 SVar:Picture:http://serv3.tcgimages.eu/img/cards/Portal_Second_Age/salvage.jpg
 Oracle:Put target card from your graveyard on top of your library.
diff --git a/forge-gui/res/cardsfolder/s/simian_brawler.txt b/forge-gui/res/cardsfolder/s/simian_brawler.txt
index f7cec3c5d97..27c4642d7e5 100644
--- a/forge-gui/res/cardsfolder/s/simian_brawler.txt
+++ b/forge-gui/res/cardsfolder/s/simian_brawler.txt
@@ -2,7 +2,7 @@ Name:Simian Brawler
 ManaCost:3 G
 Types:Creature Ape Warrior
 PT:3/3
-A:AB$ Pump | Cost$ Discard<1/Land> | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
-SVar:RemAIDeck:True
+A:AB$ Pump | Cost$ Discard<1/Land> | NumAtt$ +1 | NumDef$ +1 | AILogic$ Aristocrat | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
+SVar:AIPreference:DiscardCost$Land.Basic,Land.nonBasic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/simian_brawler.jpg
 Oracle:Discard a land card: Simian Brawler gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/soulshriek.txt b/forge-gui/res/cardsfolder/s/soulshriek.txt
index 5e7eb0d621b..21753c56d2f 100644
--- a/forge-gui/res/cardsfolder/s/soulshriek.txt
+++ b/forge-gui/res/cardsfolder/s/soulshriek.txt
@@ -1,8 +1,7 @@
 Name:Soulshriek
 ManaCost:B
 Types:Instant
-A:SP$ Pump | Cost$ B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | References$ X | AtEOT$ Sacrifice | SpellDescription$ Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
+A:SP$ Pump | Cost$ B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ X | References$ X | AILogic$ Berserk | AtEOT$ Sacrifice | SpellDescription$ Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
 SVar:X:Count$TypeInYourYard.Creature
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soulshriek.jpg
 Oracle:Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/s/spectral_cloak.txt b/forge-gui/res/cardsfolder/s/spectral_cloak.txt
index 9cbfccc842b..779485a9e4b 100644
--- a/forge-gui/res/cardsfolder/s/spectral_cloak.txt
+++ b/forge-gui/res/cardsfolder/s/spectral_cloak.txt
@@ -4,6 +4,5 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ U U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy+untapped | AddKeyword$ Shroud | Description$ Enchanted creature has shroud as long as it's untapped. (It can't be the target of spells or abilities.)
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spectral_cloak.jpg
 Oracle:Enchant creature\nEnchanted creature has shroud as long as it's untapped. (It can't be the target of spells or abilities.)
diff --git a/forge-gui/res/cardsfolder/s/stormbind.txt b/forge-gui/res/cardsfolder/s/stormbind.txt
index 84d8b23f331..4b1eba299fa 100644
--- a/forge-gui/res/cardsfolder/s/stormbind.txt
+++ b/forge-gui/res/cardsfolder/s/stormbind.txt
@@ -2,6 +2,5 @@ Name:Stormbind
 ManaCost:1 R G
 Types:Enchantment
 A:AB$ DealDamage | Cost$ 2 Discard<1/Random> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stormbind.jpg
 Oracle:{2}, Discard a card at random: Stormbind deals 2 damage to target creature or player.
diff --git a/forge-gui/res/cardsfolder/s/stronghold_biologist.txt b/forge-gui/res/cardsfolder/s/stronghold_biologist.txt
index fde95b10be7..a5901d5f633 100644
--- a/forge-gui/res/cardsfolder/s/stronghold_biologist.txt
+++ b/forge-gui/res/cardsfolder/s/stronghold_biologist.txt
@@ -2,7 +2,7 @@ Name:Stronghold Biologist
 ManaCost:2 U
 Types:Creature Human Spellshaper
 PT:1/1
-A:AB$ Counter | Cost$ U U T Discard<1/Card> | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Card.Creature | SpellDescription$ Counter target creature spell.
-SVar:RemAIDeck:True
+A:AB$ Counter | Cost$ U U T Discard<1/Card> | AILogic$ MinCMC.4 | TargetType$ Spell | TgtPrompt$ Select target Creature spell | ValidTgts$ Card.Creature | SpellDescription$ Counter target creature spell.
+SVar:AIPreference:DiscardCost$Card.cmcEQ0,Card.cmcEQ1,DiscardCost$Card.cmcEQ1,DiscardCost$Card.cmcEQ2,DiscardCost$Card.cmcEQ3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stronghold_biologist.jpg
 Oracle:{U}{U}, {T}, Discard a card: Counter target creature spell.
diff --git a/forge-gui/res/cardsfolder/w/waste_away.txt b/forge-gui/res/cardsfolder/w/waste_away.txt
index d9610216ffd..0b0e1e18705 100644
--- a/forge-gui/res/cardsfolder/w/waste_away.txt
+++ b/forge-gui/res/cardsfolder/w/waste_away.txt
@@ -2,6 +2,6 @@ Name:Waste Away
 ManaCost:4 B
 Types:Instant
 A:SP$ Pump | Cost$ 4 B Discard<1/Card> | NumAtt$ -5 | NumDef$ -5 | IsCurse$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Target creature gets -5/-5 until end of turn.
-SVar:AIPreference:DiscardCost$Card.cmcLE2
+SVar:AIPreference:DiscardCost$Card.cmcEQ0,Card.cmcEQ1,Card.cmcEQ2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waste_away.jpg
 Oracle:As an additional cost to cast Waste Away, discard a card.\nTarget creature gets -5/-5 until end of turn.