Made compatible with new cluster data

Looks in more places for cluster data, and pickles clusters
individually for easier reference. Other slight fixes.