Augment resolution for mu and sigmas
Figure cleanup
Change to use filtered clusters
Update figures for macro nosubs