minor cleanup; fixed a bug in mqtt-tx