diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson
index 124dc22e0..499929023 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set02-Isengard.hjson
@@ -31,15 +31,7 @@
 						type: discard
 						select: all(side(free people),possession,or(armor,helm,shield))
 					}
-				}
-				{
-					type: If
-					check: {
-						type: cantSpot
-						filter: companion
-						count: 6
-					}
-					true: {
+					false: {
 						type: discard
 						select: choose(possession,or(armor,helm,shield))
 					}
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson
index 0b170c995..ebb1c6376 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gondor.hjson
@@ -817,14 +817,17 @@
 				phase: maneuver
 				effect: [
 					{
-						type: exert
-						select: choose(minion)
-						count: {
+						type: Repeat
+						times: {
 							type: ForEachCultureToken
 							filter: self
 							culture: gondor
 							limit: 3
 						}
+						effect: {
+							type: exert
+							select: choose(minion)
+						}
 					}
 					{
 						type: discard
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Sites.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Sites.hjson
index 6bceb5489..ffd05629d 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Sites.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Sites.hjson
@@ -389,6 +389,7 @@
 					modifier: {
 						type: cantMove
 					}
+					until: EndOfTurn
 				}
 			}
 		]
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Ringwraith.hjson
index c578d8292..c420ba833 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Ringwraith.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Ringwraith.hjson
@@ -215,13 +215,16 @@
 					filter: another,nazgul
 				}
 				effect: {
-					type: exert
-					player: fp
-					select: choose(ringBound,companion)
-					count: {
+					type: Repeat
+					times: {
 						type: forEachFPCulture
 						over: 2
 					}
+					effect: {
+						type: exert
+						player: fp
+						select: choose(ringBound,companion)
+					}
 				}
 			}
 		]
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson
index 860562bc9..a212f2222 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson
@@ -127,7 +127,7 @@
 			type: event
 			cost: {
 				type: exert
-				select: choose(dwarf)
+				select: choose(dwarf,damage,CanExert,MinVitality(3))
 				times: 2
 				memorize: exertedDwarf
 			},
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson
index ed1b247fe..4b1cd5b98 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson
@@ -201,21 +201,10 @@
 						memorize: revealedCards
 					}
 					{
-						type: Repeat
-						times: {
-							type: ForEachInMemory
-							memory: revealedCards
-							filter: knight
-						}
-						effect: {
-							type: playCardFromDrawDeck
-							select: choose(memory(revealedCards),knight)
-							showAll: false
-							shuffle: false
-						}
-					}
-					{
-						type: shuffleDeck
+						type: playCardFromDrawDeck
+						select: choose(memory(revealedCards),knight)
+						showAll: false
+						shuffle: true
 					}
 				]
 			}
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson
index 642cd0eb1..0be217db0 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Raider.hjson
@@ -980,8 +980,12 @@
 					text: Choose how many {raider} tokens to spot
 					from: 0
 					to: {
-						type: ForEachCultureToken
-						culture: raider
+						type: Min
+						firstNumber: {
+							type: ForEachCultureToken
+							culture: raider
+						}
+						secondNumber: 6
 					}
 					memorize: spotCount
 				}
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Elven.hjson
index 3fe46a9ae..afcbdea1a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Elven.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Elven.hjson
@@ -33,7 +33,7 @@
 					}
 					{
 						type: modifyStrength
-						select: choose(minion,inSkirmishAgainst(culture(elven),companion))
+						select: choose(minion,inSkirmishAgainst(culture(elven),unbound,companion))
 						amount: {
 							type: fromMemory
 							memory: spotCount
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson
index e4cb2e46a..c885f3980 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson
@@ -1013,7 +1013,7 @@
 			}
 			{
 				type: Trigger
-				optional: false
+				optional: true
 				trigger: {
 					type: usesSpecialAbility
 					filter: minion
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson
index 93c5c0eb9..5cdc71a04 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson
@@ -97,6 +97,7 @@
 				cost: {
 					type: removeTokensCumulative
 					culture: shire
+					count: 2
 				}
 				effect: {
 					type: discard
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson
index 9bc242678..4bf2af754 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson
@@ -52,6 +52,7 @@
 						type: modifyStrength
 						select: choose(minion)
 						amount: -2
+						until: start(regroup)
 					}
 				}
 			]
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Uruk-hai.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Uruk-hai.hjson
index 89027f3bf..9b2434b9a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Uruk-hai.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Uruk-hai.hjson
@@ -714,7 +714,7 @@
 				}
 				effect: {
 					type: modifyStrength
-					select: choose(culture(uruk-hai),minion)
+					select: choose(culture(uruk-hai),hunter,minion)
 					amount: 2
 				}
 			}
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson
index 95d851ce1..53f4fb1e1 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson
@@ -709,10 +709,16 @@
 					type: cantUseSpecialAbilities
 					filter: any
 					phase: skirmish
-					requires: {
-						type: Location
-						filter: battleground
-					}
+					requires: [
+						{
+							type: Location
+							filter: battleground
+						}
+						{
+							type: CanSpot
+							filter: inSkirmish, self
+						}
+					]
 				}
 			}
 		]