Improved clustering approach.
Added preliminary cluster visualizations.