Improved sound, still glitchy