Added music and some fixes