Core game improvements