misc edits, mostly tweaking streams