more progress on main scraper and such