Moar minor tweaks

Little tweaks here and there so I can fix the turn order generation.