A LOT of changes. Temporary broken stream management.