Cleanups
Correctly format tags in capture templates
Add DELEGATED org todo keyword