Some more work on the document structure