fixed scraping, events
merged