Minor fixes and more streaming goodness.