Minor fixes. Mode receiver added