Added Music and a bit more cleanup