add updated jmacro with improved prettyprinter