rename and unexport (golint)
template tweaks; ellipsize longer messages