Music and minor fixes