added some chunker improvements