fixed some T issues