Add address scraping capability, various fixes