rewrote scrapper to better parse the pages