Finishing off saving of data.
Small plotting changes