@@ -24,7 +24,7 @@ Exercises:
 .. toctree::
     :maxdepth: 1
 
-    ../exercises/file_lab.rst
+    ../exercises/file_processing/file_lab.rst
     ../exercises/exceptions_lab.rst
     ../exercises/except_exercise.rst
     ../exercises/comprehensions_lab.rst
 
@@ -5,7 +5,7 @@ Dictionary and Set Lab
 **********************
 
 Learning about dictionaries and sets
-====================================
+
 
 Goal:
 -----
@@ -15,7 +15,7 @@ Learn the basic ins and outs of Python dictionaries and sets.
 Procedure
 ---------
 
-In your student dir in the class repo, create a ``lesson04`` dir and put in a new ``dict_lab.py`` file.
+Create a new ``dict_lab.py`` file.
 
 The file should be an executable Python script. That is to say that one
 should be able to run the script directly like so:
@@ -24,7 +24,13 @@ should be able to run the script directly like so:
 
     $ ./dict_lab.py
 
-(at least on OS-X and Linux).
+(on OS-X and Linux) or
+
+.. code-block:: bash
+
+    $ py dict_lab.py
+
+(on Windows)
 
 To make this work you, make sure you include the 'shebang' on the first line of your file.
 
@@ -33,7 +39,7 @@ To make this work you, make sure you include the 'shebang' on the first line of
     #!/usr/bin/env python3
 
 
-Finally you need to make the file executable; do that with this command:
+Finally (on OS-X and linux) you need to make the file executable; do that with this command:
 
 .. code-block:: bash
 
@@ -43,10 +49,7 @@ Finally you need to make the file executable; do that with this command:
 
 
 Add the file to your clone of the repository and commit changes frequently
-while working on the following tasks. When you are done, push your changes to
-GitHub and issue a pull request.
-
-(if you are struggling with git -- just write the code for now)
+while working on the following tasks.
 
 When the script is run, it should accomplish the following four series of
 actions:
 
@@ -17,7 +17,6 @@ Many of these topics can be useful on their own, but each assumes that you know
 
 
 .. toctree::
-    :numbered:
     :caption: Topics in the Program
     :titlesonly:
     :maxdepth: 1
 
@@ -1,7 +1,7 @@
  .. _setting_up_dev_environment:
 
-Setting up your Environment
-===========================
+1. Setting up your Environment
+==============================
 
 Before you can begin programming in Python, or work on this program,
 you need to have your computer all set up with the tools you need to do the job.
 
@@ -1,5 +1,5 @@
-Basic Python
-============
+2. Basic Python
+===============
 
 Learning a programming language is a bit of a "bootstrap" problem:
 the best way to learn is by doing, but you need the basics in order to do anything at all. So this topic jumps right in -- if you're confused at first, just keep going and it should start to make sense.