final TPTMP mod related fixes for today