diff -r 1e9751f8eb0d -r 24b866230dd4 src/main.c
--- a/src/main.c	Fri Sep 04 13:49:48 2026 +0200
+++ b/src/main.c	Sat Sep 05 12:36:04 2026 +0200
@@ -353,7 +353,7 @@
         bool iswhite = mi % 2 == 0;
         if (iswhite) {
             logi++;
-            printw("%d. ", logi);
+            printw("%d. ", logi); // TODO: add move_start offset
         }
 
         addstr(gamestate->moves[mi].string);
@@ -919,7 +919,7 @@
             } else if (gamestate->nomaterial) {
                 addstr("The game is drawn due to insufficient material.\n");
             } else if (gamestate->checkmate) {
-                addstr(gamestate->movecount % 2 == 0 ? "White" : "Black");
+                addstr(current_color(gamestate) == WHITE ? "White" : "Black");
                 addstr(" was checkmated.\n");
             } else if (gamestate->ragequit) {
                 addstr("Your opponent disconnected.\n");
@@ -1036,6 +1036,7 @@
     addch('\n');
     for (unsigned i = 0 ; i < gamestate->movecount ; i++) {
         if (i % 2 == 0) {
+            // TODO: add move_start offset
             printw("%d. %s", 1+i/2, gamestate->moves[i].string);
         } else {
             printw("%s", gamestate->moves[i].string);