Revised exercise 1, added some template and content revisions.