Fix issue with csv headers becoming field values
Tweaks to interface