new datafile and fixes