updated several templates