Small scraping fixes along with name changes of variables