template.node and multiple enhancements