minor updates to plotting macros