itsy bitsy clean up and also made make_figures_cluster work the same way as local with proper inits