Nice fix.  Using Nco, but costas-style timing