switch macro and abstraction lecture; add extra macro content