Fix several issues + respect crawl limits