Improve streams

Again, shouldn't this skip more from the actual buffer if `n > 1`?