more changes to stream stuff
change upgrade mode now