working on client side correction, circularbuffer.peek seems to be broken