Continued correction of stream references

This is two part commit, eclipse lost all concept of git.  I really dislike the number of bugs eclipse is producing now...