music2: usability fixes