More CSV files and fixes