import new data and fix some problems