more work on Tx
Merge pull request #106 from matiu/feature/ux9

more work on Tx