Better reporting in Macro window
Minor code cleanup