Streaming improvements

For upgrading and improving the stream