added missing plotting macros and cleaned some old ones