revision to template and minor tuned