template and recipe improvements