Complete Grep section, update Macro section