Adds support for streaming, minor fixes, wip
Small fixes
Merge branch 'streaming'