Minor tweaks to game flow