misc fixes to RfSensor and TrackManager
branch merge