TP 1 PLUS done. + minor detail fixes