two bug

fix for new data format