restructured content generation, other changes