Converted text-tp2 and cleaned it up a bit