Fixed TJ, implement T*

Now TJ takes per block advance, and T* takes Tl.