FN/FP xml attribs, added matrix FPs to FP pool

Dropping overlaps for lack of use case