Fixed error plots
Cleanup p. n