Improve clustering, visualization & fix stuff