updated docs and macros