cleanup tracer; restore changes
restore changes; tloop option added