renamed plots
added plotting wrappers to Measure and Generator