Lots of changes to the plotting macros. [2]