Improvements on scrape path, output needs cleaning