FIX: Several anomalies with the passenger generation routine and recording thereof.