more categories and improved crawler
Merge branch 'more_categories'