minor cosmetic tweaks
template tweak