diff --git a/TODO b/TODO
index d326e1ba0e67f3d11fa5b62668d19c81db2054dd..7c9718d4c98551b3d9226b9e7795d23f3882eada 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,12 @@
    - This means actually understanding STEPCORE_META_OBJECT, which seems to be
      undocumented...
 
-1. StepCore.
+1. Bugs / Issues
+
+* Soft bodies lose their structure if they get crushed by something heavy.
+
+
+2. StepCore.
 
 * implement compile flags:
   - STEPCORE_WITH_QT
@@ -14,10 +19,8 @@
   - STEPCORE_WITH_GUIPROPS
 * unit tests
 * movement restrictions (IN PROGRESS)
-* rigid bodies (DONE)
 * collision detection with friction (IN PROGRESS)
 * custom properties for bodies, make charge custom property (?)
-* adaptive timestep solvers (DONE)
 * correctly handle stiff ODE
 * separate position and coordinate (PARTLY DONE)
   (for independent tolerance settings, symplectic solvers)
@@ -27,10 +30,6 @@
 * implicit solvers (!)
 * more collision and constraints solvers
 * NullCollisionSolver and NullConstraintsSolver
-* molecular dynamics (potentials etc.) (DONE)
-* massive springs (DONE)
-* soft bodies (DONE)
-* fluid and gas simulation (DONE)
 * create common class for connectiong something to rigid body
 * think about 3d
 
@@ -38,15 +37,13 @@ More TODO items for StepCore can be found in
 Doxygen-generated documentation and in the source
 code (marked as TODO or XXX).
 
-2. Step.
+3. Step.
 * SVG theming
 * do calculations in separate thread (DONE)
 * use statusbar or small graphicsitem to notify
   user when creating items (DONE)
 * saving animation (navigation through time)
 * units for all quantitis, units conversion (DONE)
-* user-editable notes (DONE)
-* formulas in notes (DONE)
 * custom scene background (PARTLY DONE)
 * nice-looking descriptions for all bodies and parameters
   (with references to wikipedia or wikibooks ?) (DONE)
@@ -75,15 +72,33 @@ code (marked as TODO or XXX).
 More TODO items for Step can be found in the source code
 (marked as TODO or XXX).
 
-3. Future ideas
+
+4. Future ideas
 
 * Create a game based on Step. Original idea by Jason Harris:
-On each level, you were given a goal and a list of equipment that 
-you could use to build a machine to achieve the goal.  The equipment could 
-include lots of different stuff: balls of various types (tennis, bowling, 
-baseball), springs, trampolines, guns, ropes, pulleys, belts, gears, conveyor 
-belts, cats, mice, light bulbs, elecric fans, model rockets, TNT, etc.  You 
-would place all this stuff on the playing field, press "Go", and see if the 
-level's goal was achieved by your machine.  If not, you would modify the 
-machine and try again.  It was a lot of fun for a young proto-physicist :)
 
+  On each level, you were given a goal and a list of equipment that you could
+  use to build a machine to achieve the goal.  The equipment could include
+  lots of different stuff: balls of various types (tennis, bowling, baseball),
+  springs, trampolines, guns, ropes, pulleys, belts, gears, conveyor belts,
+  cats, mice, light bulbs, elecric fans, model rockets, TNT, etc.  You would
+  place all this stuff on the playing field, press "Go", and see if the
+  level's goal was achieved by your machine.  If not, you would modify the
+  machine and try again.  It was a lot of fun for a young proto-physicist :)
+
+----------------------------------------------------------------
+
+Overall goal: To make Step a better teaching tool
+
+For details, see the list above.
+
+ * Add missing object types
+    + half plane (ground)
+    + rope(?)
+ * Add missing physics concepts
+    + coefficient of restitution
+    + friction
+ * Improve user interaction
+    + Add timeline
+    + Improve selection, moving and resizing of objects.
+    +