bug fixes and first implementation of connect streams