Trying to reducing the buffering.

This is the important part, replacing queues with ones which don't buffer very much.