More plots, spec fixes
Including plot files this time