Added a journal entry, updated some template files