Improve saving of figures - close existing and increment files.