improved scraper and added ideas for macro control