Minor tweaks, adjustments to TP, experimental un-named TP