adding more audio and removing useless code
fixint merge...