some tweaks to the format of several templates