shapeoko · WillAdams · Dec 3, 2013 · Dec 4, 2013 · Dec 4, 2013 · Dec 4, 2013
diff --git a/Instructions/00_overview.md b/Instructions/00_overview.md
@@ -2,20 +2,34 @@
 
 The ShapeOko is an assembly of sub-assemblies. There are only a few steps:
 
-1. Assemble and test the electronics
-2. Assemble 20 V-Wheels (25203-02) and 6 Smooth Idlers (25197-02)
-3. Assemble 3 Motor Mount Carriages (PS20022)
-4. Assemble Z Assembly Carriage (PS20021), Z-Axis Rail Assembly (PS20028) to make the Spindle Carriage Assembly (PS20029)
-5. Assemble Gantry Carriage (PS20031) Sub Gantry (PS20023) to make the Complete Gantry (PS20025)
-6. Assemble Waste Board Assembly and Y-Axis Rail Assemblies (PS20024) Slide onto Gantry
-7. Assemble the work area to complete the machine
+1. Assemble and test the [electronics](01_electronics.md)
+2. Assemble the [V-wheels and Smooth Idlers](02_vwheels_and_idlers.md) (25203-02) and  (25197-02)
+3. Assemble 3 [Motor Mount Carriages](03_carriages.md) (PS20022)
+4. Assemble Z Assembly Carriage (PS20021), Z-Axis Rail Assembly (PS20028), and Spindle Carriage Assembly (PS20029) to make the [Z-Axis](04_zaxis.md)
+5. Assemble Gantry Carriage (PS20031) and Sub Gantry (PS20023) to make the Complete [Gantry](05_gantry.md) (PS20025)
+6. Assemble Waste Board Assembly and Y-Axis Rail Assemblies (PS20024), Slide Gantry onto the [rails and secure with the endplates](06_endplates.md)
+7. Assemble the [work area](07_workarea.md) to complete the machine
 
 If you have any difficulties with assembly, please check the ShapeOko [wiki](http://www.shapeoko.com/wiki) and [forums](http://www.shapeoko.com/forum/index.php).
 
-##A Note on Tapping
+##Notes
 
-There is one fabrication-like step which may be necessary, tapping the MakerSlide. If your MakerSlide is not already tapped, and you do not have experience tapping it, it is suggested that you begin as soon as practicable. Do not however, attempt to tap all of the threads in a single session, instead, tap one or two threads, then proceed to the next step in the process. After completing on eor two steps, return to tapping. Doing it in this fashion will avoid the tedium of a lengthy session.
+###Tools
 
-Start w/ the short length which is used for the Z-axis Carriage (it only needs to be tapped at one end, so a failure to tap two good threads at one end will not render it unusable. Tap one thread at either end, then tap one thread in each of the remaining pieces of MakerSlide, then return to the first piece and start over, tapping a single thread in each piece each time.
+Only basic tools are required, unless one's MakerSlide needs to be tapped, in which case, in addition to wrenches, wire cutters and an assortment of Allen keys one will need an M5 x 0.8mm thread tap and handle. The 5mm and 8mm wrenches are close enough in size to 5/16" and 1/2" wrenches that one can substitute those, or when one needs 2 8mm wrenches, use a 1/2" and an 8mm. Similarly, the set screws should take a 1.5mm Allen key, but a 1/16" is only slightly larger and may afford better contact and be less likely to round out the screw.
+
+###Screw Sizes
+
+For the most part, it's obvious which size screw is used for what, but the M5 10mm and 12mm BHCS (button head cap screws) are easily confused — while it's not noticeable when the shorter 10mm length is used where one ought to use a 12mm, the 10mm screws are intended for use with MakerSlide insertion nuts and a 12mm screw is too long and will bottom out before beginning to hold anything in place.
+
+###Electronics and Mechanicals
+
+Please note that while the assembly instructions have these two separated, it is probably best to partially disassemble the electronics after testing them and mount the motors onto the appropriate motor mount carriage plates as you are assembling the machine for the Z- and X-axes. Putting this off will require either partial disassembly (Z-axis) or an almost impossible reach into a very cramped space to attach very small screws and washers (Y-axis).
+
+###A Note on Tapping
+
+There is one fabrication-like step which may be necessary, tapping the MakerSlide. If your MakerSlide is not already tapped, and you do not have experience tapping it, it is suggested that you begin as soon as practicable. Do not however, attempt to tap all of the threads in a single session, instead, tap one or two threads, then proceed to the next step in the process. After completing one or two steps, return to tapping. Doing it in this fashion will avoid the tedium of a lengthy session.
+
+Start with the short length which is used for the Z-axis Carriage (it only needs to be tapped at one end, so a failure to tap two good threads at one end will not render it unusable. Tap one thread at either end, then tap one thread in each of the remaining pieces of MakerSlide, then return to the first piece and start over, tapping a single thread in each piece each time. By the time you're done, you'll be a pro (well, good at it anyway) and you won't have one piece which has all bad threads. Don't despair if you strip the threads on a piece — the default bolts for attaching MakerSlide are quite short and this is easily remedied by tapping the stripped holes deeper and using a longer bolt.
 
 
diff --git a/Instructions/01_electronics.md b/Instructions/01_electronics.md
@@ -1,6 +1,6 @@
 # Testing Electronics
 ## Overview
-![exploded view of assembly step](http://placehold.it/200x200)  ![Arduino, gShield, wiring, stepper motors, lit](tPictures/so_e_arduino_wired_li_2.jpg) ![image of required components](tPictures/so_electronics_parts_2.jpg) ![Tools](tPictures/so_e_tools_2.jpg)
+![Wiring diagram](http://placehold.it/200x200)  ![Arduino, gShield, wiring, stepper motors, lit](tPictures/so_e_arduino_wired_li_2.jpg) ![image of required components](tPictures/so_electronics_parts_2.jpg) ![Tools](tPictures/so_e_tools_2.jpg)
 
 Before we get all crazy bolting our new machine together, let's give our electronics a test run. It's frustrating to have the machine fully assembled, only to find there is a problem with your electronics that may require disassembly! Let's cut that off at the pass and give everything a thorough checking first.
 
@@ -103,7 +103,7 @@ Next, connect the grey wires from the terminal blocks to the stepper motors. Mak
 
 Please note the gShield takes two different sizes of screwdriver. 1/8" for the screws in the blue power connector, 3/32" for the screws in the green stepper motor connectors.
 
-The green stepper motor connectors should be unscrewed so as to open them up as the left-most connector is below.
+The green stepper motor connectors should be unscrewed so as to open them up as the right-most connector is below.
 
 ![Open connector on gShield](tPictures/so_e_arduino_open_4.jpg)
 

diff --git a/Instructions/02_vwheels_and_idlers.md b/Instructions/02_vwheels_and_idlers.md
@@ -2,11 +2,11 @@
 
 ![V- and Idler Wheel Parts](tPictures/so_vw_iw_parts_2.jpg)
 ![V-Wheel Assembled](tPictures/so_vwi_vwheel_2.jpg)
-![Idler Wheel Assembled](tPictures/so_vwi_vwheel_2.jpg)
+![Smooth Idler Wheel Assembled](tPictures/so_smooth_idler_2.jpg)
 
 Makerslide uses V-wheels to allow for movement along the rails which it affords.
 
-The belts which the stepper motors drive the X- and Y-axes with require smooth idlers to route the belts so that they are held against the pulleys on the motor shafts.
+The belts which the stepper motors drive the X- and Y-axes which require smooth idlers to route the belts so that they are held against the pulleys on the motor shafts.
 
 ##V-Wheels
 
@@ -41,7 +41,7 @@ Alternate, assembly-line procedure for the V-Wheels:
 
 1. Arrange all the pieces on a stable, flat work surface
 2. Place one bearing into each V-Wheel 
-3. Place a V-Wheel bearing side down onto the longest M5 bolt which is available, add a precision shim, then another bearing, press things together --- repeat until the bolt is full, clear the bolt and repeat until done
+3. Place a V-Wheel bearing side down onto the longest M5 bolt which is available, add a precision shim, then another bearing, press things together — repeat until the bolt is full, clear the bolt and repeat until done
 
 ##Smooth Idlers
 ![Smooth Idler Assembly](tPictures/25197-02_2.png)
@@ -70,4 +70,4 @@ Alternate, assembly-line procedure for the V-Wheels:
 5. Using your thumbs, squeeze the assembly together. A small portion of the second bearing will be protruding from the edge of the smooth idler. This is normal. We will tighten the entire assembly when the idlers gets bolted to the motor mount plate
 6. Repeat this procedure for the remaining smooth idlers (6 total)
 
-![Idler Wheel Assembled](tPictures/so_vwi_vwheel_4.jpg)
+![Smooth Idler Wheel Assembled](tPictures/so_smooth_idler_4.jpg)
diff --git a/Instructions/03_carriages.md b/Instructions/03_carriages.md
@@ -1,12 +1,14 @@
 # Carriages
 ## Overview
-![exploded view of Motor Mount Carriages](tPictures/PS20022_2.png)  ![image of completed assembly step](http://placehold.it/200x200) ![exploded view of assembly step](http://placehold.it/200x200) ![video?](http://placehold.it/200x200)
+![exploded view of Motor Mount Carriages](tPictures/PS20022_2.png)
+![Motor Mount Carriage, parts and tools](tPictures/so_motor_mount_carriages_parts_2.jpg)
+![Motor Mount Carriages parts](tPictures/so_motor_mount_carriage_parts_2.jpg)
 
-This step is the bulk of the work required to assemble your machine. There are two different styles of plates that we will be assembling in this step. The first style includes a stepper motor, there are 3 of these plates total, and they will be used to drive both your X and Y axis. The other style is nearly identical to the first, with the exception of not having a stepper motor or smooth idlers attached. This plate will be used to connect your Z-axis assembly to your X-axis assembly. 
-
-The 3 plates with stepper motors are identical and interchangeable. The plates are symmetrical, so there is no such thing as a front and a back (as they're the same). Keep in mind that your stepper motor will go on the opposite side of your wheels and smooth idlers.
+This step is the bulk of the work required to assemble your machine. There are two different styles of plates that we will be assembling in this step. The first style includes a stepper motor, there are 3 of these plates total, and they will be used to drive both your X- and Y-axes. The other style is nearly identical to the first, with the exception of not having a stepper motor or smooth idlers attached. This plate will be used to connect your Z-axis assembly to your X-axis assembly. 
 
+The 3 plates with stepper motors are identical and interchangeable. The plates are symmetrical, so there is no such thing as a front and a back (as they're the same) until one determines this by attaching parts. Keep in mind that your stepper motor will go on the opposite side of your wheels and smooth idlers.
 
+It might be easier and more straight-forward to assemble all four of them to match the Z-axis motor carriage mount plate, then set one aside for that, and add smooth idler wheels to make the other three.
 
 
 
@@ -17,23 +19,35 @@ The 3 plates with stepper motors are identical and interchangeable. The plates a
 
 ####Parts
 
- *   Motor Mount Plate (26029-01) x 3pcs
+ *   Motor Mount Plate (12ga) (26029-01) x 3pcs
  *   Eccentric Nut (30158-01) x 6pcs
- *   (from step #1) - V-Wheel (25203-02) x 12pcs
- *   (from step #2) - Smooth Idler (25197-02) x 6pcs
+ *   (from previous step) - Dual Bearing V-Wheel (25203-02) x 12pcs
+ *   (from previous step) - Smooth Idler (25197-02) x 6pcs
  *   M5 x 20mm Button Head Cap Screw (PS20004) x 12pcs
  *   M5 Flat Washer (25287-02) x 36pcs
  *   M5 Hex Nut (25284-02) x 12pcs
  *   M5 x 30mm Button Head Cap Screw (25286-05) x 6pcs
- *   5/16" Aluminum Spacer (25312-14) x 6pcs
+ *   3/8" x 5/16" x #12 bore Aluminum Spacer (25312-14) x 6pcs
+ *   M3 SHCS x 12 pcs (for attaching the stepper motors)
+ *   M3 Flat Washer x 12 pcs (for attaching the stepper motors)
+ *   GT2 pulley (to attach to the stepper motors)
 
 ####Tools
-* M3 Hex Key
 
+ * M3 Hex Key
+ * 2.5mm Hex Key (used for the M3 screws if attaching the motor)
+ * 1.5mm Hex Key (used for the set screws in the pulley)
+
+![assembled idler](tPictures/so_smooth_idler_2.jpg)
+![assembled V-wheel](tPictures/so_v_wheel_2.jpg)
+![Motor Mount Carriages parts](tPictures/so_motor_mount_carriage_parts_2.jpg)
+![](tPictures/so_e_motor_pulley_2.jpg)
 
 These are the plates that will mount on either end of the gantry and on the rear of the X-Axis.
 
-1. Connect V-Wheels to plate
+![](tPictures/so_smooth_idler_bolt_spacer_washers_2.jpg)
+
+1. Connect V-Wheels to the plate
 	- two static at the top
 	- two eccentric at the bottom
 2. Connect the smooth idlers to plate
@@ -44,22 +58,8 @@ These are the plates that will mount on either end of the gantry and on the rear
 	- Using 4 x M3x6mm SHCS, attach the stepper motor
 	- Use an M3 washer between the SHCS and the plate
 
-![assembled idler](tPictures/PS20022_2.png)
-
+![Assembled Motor Mount Carriages](tPictures/so_motor_mount_carriage_4.jpg)
 
-###Requirements
-
-####Parts
+Please note that the above image does not show the stepper motor in place. As previously noted, one should attach at least one stepper motor for the X-axis plate, as it's difficult to attach it once the gantry carriage is assembled. Use 4 M3 screws, 4 M3 washers and also attach the G2 pulley.
 
-- 1 26029-01 Motor Mount Plate (12ga)
-- 2 30158-01 Eccentric Nut
-- 4 25203-02 Dual Bearing V Wheel Kit (assembly)
-- 4 PS20004 M5x20mm BHCS
-- 12 25287-02 Flat Washer, M5
-- 4 25284-02 M5 Hex Nut
-- 2 25197-02 Smooth Idler Assembly
-- 2 25286-05 M5 x 30mm, BHCS
-- 2 25312-14 3/8" x 5/16" x #12 bore, aluminum spacer
 
-####Tools
-* M3 Hex Key