improvements + bugfix in stream