ENH: add clustering option + other metrics