fix csv output; improve display output