change to purely fix-point alg and add more dbg info
resolve conflicts