TNTRun improvements