CrawlWorker and other minor tweaks