Finalize clustermap

This closes #332 with a few tweaks.