Added a better file naming scheme and saved all the figures currently being generated.