Update db and scraper, decompose scraper functions, bugfixes