moved macros to pure/
updates