Made enhancements for on the fly plots.