reviewed all files that seems to have anything to do with streams

CE-428 is done now I think