cleaup Scrape logic, better error handling and debug artifacts