Various fixes to board game UI logic, and internal logic