diff --git a/src/main.c b/src/main.c
index ae1a10a..ac40606 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,11 +13,15 @@ uint8_t mainGetChar(char c) {
 
 void mainBufferChar(uint8_t card, uint8_t *tiles) {
   uint8_t suit, number;
+
+  if(card >= CARD_DECK_SIZE) {
+    tiles[0] = mainGetChar('N');
+    tiles[1] = mainGetChar('A');
+    return;
+  }
   
   suit = cardGetSuit(card);
   number = cardGetNumber(card);
-  BGB_printf("For %u, Suit %u number %u", card, suit, number);
-  BGB_BREAKPOINT;
 
   switch(suit) {
     case CARD_SUIT_CLUBS:
@@ -129,15 +133,38 @@ void main() {
     
 
     // DEBUG DRAW
-    uint8_t tiles[2];
+    uint8_t tiles[10];
     for(j = 0; j < POKER_PLAYER_COUNT_MAX; j++) {
-      mainBufferChar(CARD_CLUBS_KING, tiles);
-      set_bkg_tiles(0x00, j, 2, 1, tiles);
+      mainBufferChar(POKER_PLAYERS[j].hand[0], tiles);
+      mainBufferChar(POKER_PLAYERS[j].hand[1], tiles + 2);
 
-      mainBufferChar(CARD_DIAMONDS_FIVE, tiles);
-      set_bkg_tiles(0x03, j, 2, 1, tiles);
+      tiles[4] = COMMON_TILE_3;
+
+      if((POKER_PLAYERS[j].state & POKER_PLAYER_STATE_FOLDED) == 0) {
+        tiles[5] = COMMON_TILE_3;
+      } else {
+        tiles[5] = mainGetChar('F');
+      }
+
+      if(j == POKER_PLAYER_BETTER) {
+        tiles[5] = mainGetChar('<');
+      } else {
+        tiles[5] = COMMON_TILE_3;
+      }
+      set_bkg_tiles(0x00, j, 7, 1, tiles);
     }
 
+    for(j = 0; j < POKER_COMMUNITY_SIZE_MAX; j++) {
+      if(j >= POKER_COMMUNITY_SIZE) {
+        tiles[j*2] = COMMON_TILE_3;
+        tiles[(j*2) + 1] = COMMON_TILE_3;
+      } else {
+        mainBufferChar(POKER_COMMUNITY[j], tiles + (j * 2));
+      }
+    }
+
+    set_bkg_tiles(0x00, POKER_PLAYER_COUNT_MAX + 1, 10, 1, tiles);
+
     // Tick time.
     timeUpdate();
   }
diff --git a/src/poker/card.c b/src/poker/card.c
index d991b37..c2571b6 100644
--- a/src/poker/card.c
+++ b/src/poker/card.c
@@ -12,7 +12,7 @@ inline uint8_t cardGetNumber(uint8_t card) {
 }
 
 inline uint8_t cardGetSuit(uint8_t card) {
-  return card / CARD_SUIT_COUNT;
+  return card / CARD_COUNT_PER_SUIT;
 }
 
 inline uint8_t cardGet(uint8_t number, uint8_t suit) {
diff --git a/src/poker/card.h b/src/poker/card.h
index 908ad2f..0749300 100644
--- a/src/poker/card.h
+++ b/src/poker/card.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include "../libs.h"
+#include "../util.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Cards