Some more game structure improvements.