Fix volume bug
Misc changes to streams