more improvements on streaming side