Superconducting and magnetic properties of materials with varying clustering in YBA2(CU1-xMx)3Oy with M = Fe, Co, Ni