fixed return values for some of the plot functions
Merge branch 'master' into return-values