Ironing out the bugs with the main game mode