CSV export fully functional - misc improvements