fix bugs, add more after process