few macros changes