Whistle particles pipe fix / tweaks