fixed few tpr issues