Update Macro section and fix many typos