Adding set associativity conflicts, some clean up,

…improving the output, and… I think that’s all.