diff --git a/components/game/card/Grouped.vue b/components/game/card/Grouped.vue
index 48c5dcc..f9df08d 100644
--- a/components/game/card/Grouped.vue
+++ b/components/game/card/Grouped.vue
@@ -146,23 +146,23 @@ function discardCardClick(card: Card) {
           }, [] as number[])" :noEffects="noEffects" :discardable="discardable">
         <template v-for="t in tokens">
           <GameToken :token="t" @useToken="tokenClick(t, c)" v-if="
-            (t.effect == CardEffects.SACRIFICE &&
+            ((t.effect == CardEffects.SACRIFICE &&
               playingTurn &&
               !playingTurn?.cardsLocked.includes(c._id.toString())) ||
-            (t.effect == CardEffects.PREPARE &&
-              c.cardType == CardType.CHAMPION) ||
-            (t.effect == CardEffects.STACK_NEXT_ACTION_BOUGHT &&
-              c.cardType == CardType.ACTION) ||
-            (t.effect == CardEffects.STUN &&
-              c.cardType == CardType.CHAMPION &&
-              championsKillable) ||
-            t.effect == CardEffects.PLAY_NEXT_CARD_BOUGHT ||
-            t.effect == CardEffects.STACK_NEXT_CARD_BOUGHT ||
-            t.effect == CardEffects.RESTACK_DISCARDED_CARD ||
-            (t.effect == CardEffects.RESTACK_DISCARDED_ACTION &&
-              c.cardType == CardType.ACTION) ||
-            (t.effect == CardEffects.RESTACK_DISCARDED_CHAMPION &&
-              c.cardType == CardType.CHAMPION)
+              (t.effect == CardEffects.PREPARE &&
+                c.cardType == CardType.CHAMPION) ||
+              (t.effect == CardEffects.STACK_NEXT_ACTION_BOUGHT &&
+                c.cardType == CardType.ACTION) ||
+              (t.effect == CardEffects.STUN &&
+                c.cardType == CardType.CHAMPION &&
+                championsKillable) ||
+              t.effect == CardEffects.PLAY_NEXT_CARD_BOUGHT ||
+              t.effect == CardEffects.STACK_NEXT_CARD_BOUGHT ||
+              t.effect == CardEffects.RESTACK_DISCARDED_CARD ||
+              (t.effect == CardEffects.RESTACK_DISCARDED_ACTION &&
+                c.cardType == CardType.ACTION) ||
+              (t.effect == CardEffects.RESTACK_DISCARDED_CHAMPION &&
+                c.cardType == CardType.CHAMPION)) && ((wrapped && i == (cards.length - 1)) || !wrapped)
           "></GameToken>
         </template>
         <button v-if="championsKillable && c.cardType == CardType.CHAMPION" @click.stop="damageChampionClick(c)"
diff --git a/components/game/overlay/Discard.client.vue b/components/game/overlay/Discard.client.vue
index e020690..66efb33 100644
--- a/components/game/overlay/Discard.client.vue
+++ b/components/game/overlay/Discard.client.vue
@@ -33,6 +33,7 @@ const discardTokens = computed(() => {
       ].includes(t.effect)
     )
   }
+  return []
 }
 
 );
diff --git a/pages/game.vue b/pages/game.vue
index 547f646..cf0dd0e 100644
--- a/pages/game.vue
+++ b/pages/game.vue
@@ -10,7 +10,6 @@ import {
   leaveGame,
   surrender,
 } from "~/netcode";
-import { delay } from "~/netcode/events";
 import {
   type Container,
   type Effect,
@@ -28,7 +27,6 @@ const gameId = route.query.id;
 
 const {
   data: game,
-  pending,
   error,
   refresh,
   execute,
@@ -235,8 +233,8 @@ onUnmounted(() => {
 
       </div>
 
-      <ClientOnly>
-        <div id="turn_buttons" v-if="game">
+      <ClientOnly v-if="game">
+        <div id="turn_buttons">
           <template v-if="game.started">
             <button id="end_turn" class="end_turn_button turn_icon" :class="{ hidden: !isTurn }"
               @click="endTurn(game._id)" v-if="isTurn">
@@ -257,7 +255,8 @@ onUnmounted(() => {
           </template>
         </div>
         <div>
-          <button v-if="game && game.started && selfPlayer" class="red" @click="surrender(game._id)">
+          <button v-if="game.started && selfPlayer && game.owner._id != selfPlayer.user._id" class="red"
+            @click="surrender(game._id)">
             Surrender
           </button>
           <button @click="navigateTo('/lobby')">Return to lobby</button>