Incorporated ability to find clusters from an external catalog.

Also fixed a minor bug on the number of non-clicks.