Cleanup tpx, extend & unify functionality