--- a/software.org	Wed May 11 10:55:13 2011 +0530
+++ b/software.org	Wed May 11 13:27:15 2011 +0530
@@ -21,12 +21,11 @@
 |------------------------------------------------------+-----------------------------+----------------|
 | Commercial Software                                  | Recommended FOSS Equivalent | Other Packages |
 |------------------------------------------------------+-----------------------------+----------------|
-| MATLAB                                               | [[file:matlab.org::sec-1][Scilab]]                      | [[file:matlab.org::sec-2][Octave]]         |
-| AutoCad                                              |                             | [[file:autocad.org::sec-1][KiCAD]]          |
-|                                                      |                             | [[file:autocad.org::sec-2][Freecad]]        |
-| Mathematica                                          | Sage                        | Maxima         |
-| Maple                                                | Sage                        | Maxima         |
-| Turbo C                                              | GCC                         |                |
+| MATLAB                                               | [[file:matlab.org::sec-1][Scilab]]                      | [[file:matlab.org::sec-3][Octave]]         |
+|                                                      | [[file:matlab.org::sec-2][SciPy]]                       |                |
+| Mathematica                                          | [[file:mathematica.org::sec-1][Sage]]                        | [[file:mathematica.org::sec-2][Maxima]]         |
+| Maple                                                | [[file:mathematica.org::sec-1][Sage]]                        | [[file:mathematica.org::sec-2][Maxima]]         |
+| Turbo C                                              | [[file:turboc.org::sec-1][GCC]]                         |                |
 | Microsoft Office                                     | Open Office                 | LaTeX          |
 |                                                      |                             | Libre Office   |
 | Microsoft Windows                                    | GNU/Linux                   |                |
@@ -41,5 +40,7 @@
 | Mentor-ICstation, Cadence-Virtuoso                   | Magic                       |                |
 | Modelsim                                             | ghdl, freehdl               |                |
 | S-Plus                                               | R                           |                |
+| AutoCad                                              | /no recommendations/        | [[file:autocad.org::sec-1][KiCAD]]          |
+|                                                      |                             | [[file:autocad.org::sec-2][Freecad]]        |
 |------------------------------------------------------+-----------------------------+----------------|