Improvements of TnT