fixed all streaming bugs