improved macros and readme