a few tweaks to pages, better comments in macros section