more cmap cleanups + cluster_level tweaks