lots of changes.  comb filter converted to working in mag+angle (not quite finished blending yet)x