John, there is one consistent set of typos in your formulas for $X(\ell,r,y,\tau)$ -- you've left out the second parameter $r$. Can you edit them, so we can make this thread look nice.