Fix and Music update