improved plotting
Merge branch 'cleanupplots' into develop