Add a noise PreFX option, plus some incidental fixes...