More error messages + trim strings in CSV.