tightened up comms handling for rx