fix matched masking and add plots
changes from new plots
more updates
Merge branch 'upmaster'