commenting + some mute problem tweaks