Some cosmetic changes to make the graphs look better and provide better filenames