added new observables to plotting macro