Better csv output

Here's some updates that should output CSV and have one row per candidate.