Some restructuring of the function ordering and addition of the
clustering coocurence anaysis.