More work on endgame messages