fix some bugs, regenerate data