chunking improvements