Systematics calculations, update plotting macros