TxSpeedEstimator + minor fix