improved stream behavior and reporting to the ui