Modify crawler and fix some bugs