Add categories. Minor re-organization.