Add header guards
new plotting macros