further streaming improvements