diff --git a/resources/content/challenges/1_get_git.hbs b/resources/content/challenges/1_get_git.hbs
index 4c796b8e..195f7793 100644
--- a/resources/content/challenges/1_get_git.hbs
+++ b/resources/content/challenges/1_get_git.hbs
@@ -33,6 +33,11 @@
         }'></p>
 </div>
 
+<div class="box--border--grey box--tip">
+    <h3 i18n-data="ch01~Windows Users"></h3>
+    <p i18n-data="ch01~On Windows, you are able to set quite a few options while installing Git. Normally, you can leave all of these options as they are set by default. However, if you have never heard of Vim as a text editor, then you might want to choose a different default editor, as Vim is relatively complex to handle. So pay a little attention to which options are set during installation."></p>
+</div>
+
 <div class="box--solid--light">
     <h2 i18n-data="ch01~Git Software"></h2>
     <p i18n-data="ch01~Git on its own isn't like other programs on your computer. You'll likely not see an icon on your desktop, but it will always be available to you and you'll be able to access it at any time from your terminal or Git desktop applications."></p>
diff --git a/resources/content/challenges/5_remote_control.hbs b/resources/content/challenges/5_remote_control.hbs
index 0bb586dd..f5823bbc 100644
--- a/resources/content/challenges/5_remote_control.hbs
+++ b/resources/content/challenges/5_remote_control.hbs
@@ -14,7 +14,7 @@
     <figure>
         <img class="img_remotes" src="../../assets/imgs/remotes.png"
             alt="A diagram showing a central server holding a repository. Two computers, on either side, are connecting to the server.">
-        <figcaption i18n-type="standard_html" i18n-data="ch05~A server (e.g. by GitHub), holding the {/str/}remote{/str_e/} repository and two computers, each of them holding a {/str/}local{/str_e/} copy of the repository. You can either access and edit the remote repository with your browser or edit the repository locally and tell your computer (on {/str/}terminal{/str_e/}) to talk to the server."></figcaption>
+        <figcaption i18n-type="standard_html" i18n-data="ch05~The illustration shows a server (e.g. by GitHub), holding the {/str/}remote{/str_e/} repository and two computers, each of them holding a {/str/}local{/str_e/} copy of the repository. You can either access and edit the remote repository with your browser or edit the repository locally and tell your computer (on {/str/}terminal{/str_e/}) to talk to the server."></figcaption>
     </figure>
 </div>
 
@@ -32,7 +32,7 @@
         <li i18n-data="ch05~Give it a name that matches your local repository's name, 'hello-world', and a short description."></li>
         <li i18n-data="ch05~Make it public. This means it'll be listed on your public profile."></li>
         <li i18n-data="ch05~Don't initialize with a README because we already have a file, locally, named 'readme.txt'. This is a helper option from GitHub if you hadn't already made it."></li>
-        <li i18n-data="ch05~Leave '.gitignore' and 'license' set to 'none'. We won't use them this tutorial."></li>
+        <li i18n-data="ch05~Don't initialize with '.gitignore' or a license, we won't use them in this tutorial."></li>
         <li i18n-data="ch05~Click create repository!"></li>
     </ul>
 </div>
diff --git a/resources/content/pages/about.hbs b/resources/content/pages/about.hbs
index 1f04b1fa..ed8865c2 100644
--- a/resources/content/pages/about.hbs
+++ b/resources/content/pages/about.hbs
@@ -7,7 +7,7 @@
 
 <p i18n-data="about~Git-it uses the real terminal, Git and GitHub (rather than emulating them). When you finish you'll have real repositories on your GitHub account and green squares on your contribution chart!"></p>
 
-<h4 i18n-data="about~The Code that Made Git-it"></h4>
+<h4 i18n-data="about~The Code that made Git-it"></h4>
 
 <p i18n-type="standard_html"
     i18n-data="about~This app is built with HTML, CSS and JS and uses the {/lnk_electron/}Electron{/lnk_e/} library. All of the code for Git-it is online in its {/lnk_repo/}repository on GitHub{/lnk_e/}. Git-it is a labor of love, originally created by Jessica Lord ({/lnk_jlord/}@jlord{/lnk_e/}) and kind contributors."
diff --git a/resources/i18n/en-US/about.json b/resources/i18n/en-US/about.json
index 19612b0b..9f59430e 100644
--- a/resources/i18n/en-US/about.json
+++ b/resources/i18n/en-US/about.json
@@ -4,6 +4,6 @@
   "Some challenges require an internet connection, so you'll need to be online to complete Git-it. But you can always open the app and view the challenges and resources offline.": "Some challenges require an internet connection, so you'll need to be online to complete Git-it. But you can always open the app and view the challenges and resources offline.",
   "Real Development Environment": "Real Development Environment",
   "Git-it uses the real terminal, Git and GitHub (rather than emulating them). When you finish you'll have real repositories on your GitHub account and green squares on your contribution chart!": "Git-it uses the real terminal, Git and GitHub (rather than emulating them). When you finish you'll have real repositories on your GitHub account and green squares on your contribution chart!",
-  "The Code that Made Git-it": "The Code that Made Git-it",
+  "The Code that made Git-it": "The Code that made Git-it",
   "This app is built with HTML, CSS and JS and uses the {/lnk_electron/}Electron{/lnk_e/} library. All of the code for Git-it is online in its {/lnk_repo/}repository on GitHub{/lnk_e/}. Git-it is a labor of love, originally created by Jessica Lord ({/lnk_jlord/}@jlord{/lnk_e/}) and kind contributors.": "This app is built with HTML, CSS and JS and uses the {/lnk_electron/}Electron{/lnk_e/} library. All of the code for Git-it is online in its {/lnk_repo/}repository on GitHub{/lnk_e/}. Git-it is a labor of love, originally created by Jessica Lord ({/lnk_jlord/}@jlord{/lnk_e/}) and kind contributors."
 }
diff --git a/resources/i18n/en-US/ch01.json b/resources/i18n/en-US/ch01.json
index 4b74d077..b8f192bd 100644
--- a/resources/i18n/en-US/ch01.json
+++ b/resources/i18n/en-US/ch01.json
@@ -8,6 +8,8 @@
   "{/str/}Windows{/str_e/}: Use the {/str/}Git Shell{/str_e/} for your terminal.": "{/str/}Windows{/str_e/}: Use the {/str/}Git Shell{/str_e/} for your terminal.",
   "{/str/}Mac{/str_e/}: You can use the {/str/}terminal{/str_e/} app as your terminal.": "{/str/}Mac{/str_e/}: You can use the {/str/}terminal{/str_e/} app as your terminal.",
   "Already have Git or not sure? Type {/cde/}git --version{/cde_e/} in your terminal and if it returns a version number higher than {/cde/}1.7.10{/cde_e/}, you're set! For more information, visit the {/lnk_git/}Git website{/lnk_e/}.": "Already have Git or not sure? Type {/cde/}git --version{/cde_e/} in your terminal and if it returns a version number higher than {/cde/}1.7.10{/cde_e/}, you're set! For more information, visit the {/lnk_git/}Git website{/lnk_e/}.",
+  "Windows Users": "Windows Users",
+  "On Windows, you are able to set quite a few options while installing Git. Normally, you can leave all of these options as they are set by default. However, if you have never heard of Vim as a text editor, then you might want to choose a different default editor, as Vim is relatively complex to handle. So pay a little attention to which options are set during installation.": "On Windows, you are able to set quite a few options while installing Git. Normally, you can leave all of these options as they are set by default. However, if you have never heard of Vim as a text editor, then you might want to choose a different default editor, as Vim is relatively complex to handle. So pay a little attention to which options are set during installation.",
   "Git Software": "Git Software",
   "Git on its own isn't like other programs on your computer. You'll likely not see an icon on your desktop, but it will always be available to you and you'll be able to access it at any time from your terminal or Git desktop applications.": "Git on its own isn't like other programs on your computer. You'll likely not see an icon on your desktop, but it will always be available to you and you'll be able to access it at any time from your terminal or Git desktop applications.",
   "GitHub provides such an desktop application, the {/lnk_desktop/}GitHub Desktop{/lnk_e/} app. The GitHub Desktop app can do a lot of things with Git but not all, which is why learning the terminal is important. But once you've got that down, you'll be glad to have the desktop app because it organizes your project's information more visually, like the GitHub website.": "GitHub provides such an desktop application, the {/lnk_desktop/}GitHub Desktop{/lnk_e/} app. The GitHub Desktop app can do a lot of things with Git but not all, which is why learning the terminal is important. But once you've got that down, you'll be glad to have the desktop app because it organizes your project's information more visually, like the GitHub website.",
diff --git a/resources/i18n/en-US/ch05.json b/resources/i18n/en-US/ch05.json
index fa150a34..bd225c77 100644
--- a/resources/i18n/en-US/ch05.json
+++ b/resources/i18n/en-US/ch05.json
@@ -3,14 +3,14 @@
   "Remotes": "Remotes",
   "When you put something on GitHub that copy lives on one of GitHub's servers. This makes it a {/str/}remote{/str_e/} repository because it is not on your computer, but on a server, {/dqm/}remote{/dqm/} and somewhere else. By {/str/}pushing{/str_e/} your {/str/}local{/str_e/} (on your computer) changes to it, you keep it up to date.": "When you put something on GitHub that copy lives on one of GitHub's servers. This makes it a {/str/}remote{/str_e/} repository because it is not on your computer, but on a server, {/dqm/}remote{/dqm/} and somewhere else. By {/str/}pushing{/str_e/} your {/str/}local{/str_e/} (on your computer) changes to it, you keep it up to date.",
   "Others can always then get the latest from your project by {/str/}pulling{/str_e/} your changes down from the remote (and onto their computer). This is how everyone can work on a project together without needing access to your computer where your local copy is stored.": "Others can always then get the latest from your project by {/str/}pulling{/str_e/} your changes down from the remote (and onto their computer). This is how everyone can work on a project together without needing access to your computer where your local copy is stored.",
-  "A server (e.g. by GitHub), holding the {/str/}remote{/str_e/} repository and two computers, each of them holding a {/str/}local{/str_e/} copy of the repository. You can either access and edit the remote repository with your browser or edit the repository locally and tell your computer (on {/str/}terminal{/str_e/}) to talk to the server.": "A server (e.g. by GitHub), holding the {/str/}remote{/str_e/} repository and two computers, each of them holding a {/str/}local{/str_e/} copy of the repository. You can either access and edit the remote repository with your browser or edit the repository locally and tell your computer (on {/str/}terminal{/str_e/}) to talk to the server.",
+  "The illustration shows a server (e.g. by GitHub), holding the {/str/}remote{/str_e/} repository and two computers, each of them holding a {/str/}local{/str_e/} copy of the repository. You can either access and edit the remote repository with your browser or edit the repository locally and tell your computer (on {/str/}terminal{/str_e/}) to talk to the server.": "The illustration shows a server (e.g. by GitHub), holding the {/str/}remote{/str_e/} repository and two computers, each of them holding a {/str/}local{/str_e/} copy of the repository. You can either access and edit the remote repository with your browser or edit the repository locally and tell your computer (on {/str/}terminal{/str_e/}) to talk to the server.",
   "Create a Remote Repository": "Create a Remote Repository",
   "You want to sync your {/str/}local{/str_e/} version with one stored on GitHub.com. First create a new {/str/}remote{/str_e/} repository on GitHub.com.": "You want to sync your {/str/}local{/str_e/} version with one stored on GitHub.com. First create a new {/str/}remote{/str_e/} repository on GitHub.com.",
   "Go to {/lnk_github/}github.com{/lnk_e/}, log in, and click the '+' in the top right and then click 'New repository'.": "Go to {/lnk_github/}github.com{/lnk_e/}, log in, and click the '+' in the top right and then click 'New repository'.",
   "Give it a name that matches your local repository's name, 'hello-world', and a short description.": "Give it a name that matches your local repository's name, 'hello-world', and a short description.",
   "Make it public. This means it'll be listed on your public profile.": "Make it public. This means it'll be listed on your public profile.",
   "Don't initialize with a README because we already have a file, locally, named 'readme.txt'. This is a helper option from GitHub if you hadn't already made it.": "Don't initialize with a README because we already have a file, locally, named 'readme.txt'. This is a helper option from GitHub if you hadn't already made it.",
-  "Leave '.gitignore' and 'license' set to 'none'. We won't use them this tutorial.": "Leave '.gitignore' and 'license' set to 'none'. We won't use them this tutorial.",
+  "Don't initialize with '.gitignore' or a license, we won't use them in this tutorial.": "Don't initialize with '.gitignore' or a license, we won't use them in this tutorial.",
   "Click create repository!": "Click create repository!",
   "Readmes, .gitignores and Licenses": "Readmes, .gitignores and Licenses",
   "These are common files in open source projects so to make starting a new project easier, GitHub provides an option for creating them for you.": "These are common files in open source projects so to make starting a new project easier, GitHub provides an option for creating them for you.",