cleanup
bugfix filenaming for plots