attributes and two small bug fixes for csv

some more

some reverts

nitpick

csv love update

forgot some