Split parser and scraper, fixed bugs in parser