Improved visual clustering.
minor changes.