Improve the sound support, still kind of wonky.