Fix wierd generic
more tweaks to make csv writer easier