End game improvements