1543 streaming improvements

https://1.gravatar.com/avatar/bc4ab438f7a4ce1c406aadc688427f2c?