Somewhat improved music handling. Still a complete mess. Sigh.