Added music and time counter
merge and fix