Fixed scraper and started working on client-side issues