add comment
Fix key generation
Merge branch 'fixcmdpath' into flexible-backends
Merge branch 'template-comment' into flexible-backends
Add tests for custom functions