fixed new scraping tags, organized parser