populate and audio tag fixed and cleaned
merge conflicts