Audio changes and add r_mix