music2: bugfixes