Typos
Build instructions, types
Cleanups and typos
Reference on test org: gathering the macros there