fixed various streaming race-conditions
hotswap fixes - always interested