Update: add missing _T, fix texts