Bugfixes stream
Moves around some streaming data