diverter and flow fixes + flow randomization