new macros, improved docs