Merge "Fix categories and intro." into nyc-dev