more changes to stream stuff