many more fixes for streaming mode