Fixed T1 problem and finish some T4