Updated sharing macro format, better comments formatting for macros, small tweaks to existing converted template pages.