reimplement faucet audio correctly (mildly large commit imcoming)