Dirty code including some improvements for the clustering step.
- At this moment, they are just done visually.