template {parameter}, and minor bug fix.