Improve loggings
Fix problem with data files without headerline