@@ -103,4 +103,7 @@ have helped me with it:
 
 ***
 
-You may use this tutorial at your own risk. See [LICENSE](LICENSE).
+You may use this tutorial freely at your own risk. See
+[LICENSE](LICENSE).
+
+[List of contents](README.md#list-of-contents)
@@ -260,5 +260,5 @@ behaves like `iter([1, 2, 3])`:
 You may use this tutorial freely at your own risk. See
 [LICENSE](../LICENSE).
 
-[Previous](../basics/classes.md) | [Next](../README.md) |
+[Previous](magicmethods.md) | [Next](../README.md) |
 [List of contents](../README.md#advanced)
@@ -2,7 +2,7 @@
 
 These are my answers for exercises in the chapters. If your solution
 isn't exactly like mine but it works just fine it's ok, and you can
-[ask me](contact-me.md) why I didn't do it like you did it.
+[ask me](../contact-me.md) why I didn't do it like you did it.
 
 ## ThinkPython: The way of the program
 
@@ -407,7 +407,7 @@ isn't exactly like mine but it works just fine it's ok, and you can
     print(get_greeting())
     ```
 
-3. See [the return or print section](defining-functions.html#return-or-print).
+3. See [the return or print section](defining-functions.md#return-or-print).
 
     The greet function prints a greeting.
 
 
@@ -424,5 +424,5 @@ print("You entered " + word + ".")
 You may use this tutorial freely at your own risk. See
 [LICENSE](../LICENSE).
 
-[Previous](modules.md) | [Next](../advanced/iterators.md) |
+[Previous](modules.md) | [Next](../advanced/magicmethods.md) |
 [List of contents](../README.md#basics)
@@ -95,7 +95,7 @@ just press Ctrl+N.
 ![New File in IDLE](../images/idle-new.png)
 
 If you don't use IDLE, please take the time to
-[set up your editor correctly](editor-setup.md). When you're done your
+[set up your editor correctly](../editor-setup.md). When you're done your
 editor should give you four spaces every time you press tab.
 
 Create a file called `rain.py`, and type the following content into it:
 
@@ -25,7 +25,7 @@ you.
 ### Mac OSX
 
 I don't have an up-to-date copy of Mac OSX. If you would like to write
-instructions for OSX, [tell me](contact-me.md).
+instructions for OSX, [tell me](../contact-me.md).
 
 ### GNU/Linux
 
 
@@ -421,7 +421,7 @@ while True:
 ***
 
 You may use this tutorial freely at your own risk. See
-[LICENSE](LICENSE).
+[LICENSE](../LICENSE).
 
 [Previous](lists-and-tuples.md) | [Next](trey-hunner-zip-and-enumerate.md) |
-[List of contents](README.md#list-of-contents)
+[List of contents](../README.md#basics)
@@ -80,10 +80,10 @@ should you do if you have a problem with the tutorial?
 3. If there's something you haven't seen before in the tutorial and it's
     not explained, try to find it from the previous chapters.
 4. If you still have trouble understanding the tutorial or any other problems
-    with the tutorial, please [tell me about it](contact-me.md). I want to
+    with the tutorial, please [tell me about it](../contact-me.md). I want to
     improve this tutorial so other readers won't have the same problem as you
     have.
-5. See [Getting help](getting-help.md) if you can't contact me for some
+5. See [Getting help](../getting-help.md) if you can't contact me for some
     reason.
 
 You are free to combine this tutorial with other learning resources. If this
 
@@ -1,10 +1,11 @@
 # Setting up an editor for programming
 
-Python comes with its IDLE, and you can use it in this tutorial. If you
-don't like using it for some reason, you need [PowerShell, command prompt or
-terminal](installing-python.md#if-you-like-working-with-powershell-command-prompt-or-terminal)
-for trying out things. You also need an editor for writing code that will
-be stored in files.
+Python comes with its IDLE, and you can use it in this tutorial. If you 
+don't like using it for some reason, you need [PowerShell, command 
+prompt or 
+terminal](basics/installing-python.md#if-you-like-working-with-powershell-command-prompt-or-terminal) 
+for trying out things. You also need an editor for writing code that 
+will be stored in files.
 
 If you use IDLE as your editor, **it comes with everything set up for
 you, and you don't need to worry about setting up anything**. If you