Minor: formatting, macros...
First pass on the introduction