diff --git a/indexgen.py b/indexgen.py
index 1e209fa..31576c6 100644
--- a/indexgen.py
+++ b/indexgen.py
@@ -1,4 +1,5 @@
 import datetime,os,re
+from collections import Counter
 import log,skel,variables,tcgcore
 
 def indexgen():
@@ -210,7 +211,7 @@ def indexgen():
                     tradein.append(event["event"])
             except:
                 pass
-    tradecommon = list(set(tradeout).intersection(tradein))
+    tradecommon = list((Counter(tradeout) & Counter(tradein)).elements())
     sketch = len(tradecommon)
     if sketch > 0:
         content.write("<table class=\"sketchpads\">\n<tbody>\n<tr>\n<td><img src=\"/assets/sketch/")
diff --git a/tcgcore.py b/tcgcore.py
index 4381c06..6636cda 100644
--- a/tcgcore.py
+++ b/tcgcore.py
@@ -86,15 +86,15 @@ def printdeck(deck):
     while test < 21:
         if test % 5 == 1:
             deckstring += "  <tr>\n"
-        deckstring += "    <td><img src=\"/decks/" + deck + "/"
+        deckstring += "    <td>"
         if test in deckcards(deck):
             if test > 9:
-                deckstring += str(test)
+                deckstring += printcard(deck + str(test))
             else:
-                deckstring += "0" + str(test)
+                deckstring += printcard(deck + "0" + str(test))
         else:
-            deckstring += "00"
-        deckstring += ".gif\"></td>\n"
+            deckstring += "<img src=\"/decks/" + deck + "/00.gif\">"
+        deckstring += "</td>\n"
         if test % 5 == 0:
             deckstring += "  </tr>\n"
         test += 1