Macro support + bug fixes