reorganise RxAddr TxAddr XAddr situation; still torn, but ok for now i guess