Many fixes and improvements to scrape module