[wip] Patched up buffer, targets and augroup.