Fix mute/unmute problem with audio player and minor changes