adding mass plots and starting to tidy-up