changes to streaming. Adds comments