More cleanup and improvement to audio items.