Fixed some bugs in streams
Updated README