Final tweaks of event CSV generator