Cleanup + support for multi-part docs