Finally getting the partitioning of documents close to correct