Improve data process.
Fix some bugs.