Improve streams

Shouldn't this also read `len-1` more bytes from the actual buffer?