Minor changes in messages, and handling of header in csv-file.