more cleaning up of sound code, almost there...