General updates to core game code