Update TODO
Cleanup code
Add template variables to 'Templates' panel