Improve ChunkSender

You can add a patch for testing, but I don't want to have those dummy things in our main code. It is not really good as we have to redo it eventually.