Update template formats and todo notes