Implement pinpoint-crawling and add some fix