fixes and streaming api