Fixed clash resolution + Cosmetics