image and scraper fixes