integrate with naarad, minor template enhancements