diff --git a/Arrangement_on_surface_2/todo b/Arrangement_on_surface_2/todo
index 11ea383135e..8d7d652897f 100644
--- a/Arrangement_on_surface_2/todo
+++ b/Arrangement_on_surface_2/todo
@@ -19,49 +19,59 @@
 - Test all landmark sub-strategies
 
 - Get rid of the prefix 'get_' from all functions and methods:
-    get_bbox
+    get_all_inner_nodes()
+    get_bbox()
     	Bezier_point_2.h,
 	Bezier_x_monotone_2.h)
-    get_coefficient
+    get_boundary_in_x()
+    get_boundary_in_y()
+    get_coefficient()
 	Bezier_cache.h
 	Bezier_curve_2.h
 	Rational_arc_2.h
 	CORE_algebraic_number_traits.h
-    get_index
+    get_data()
+    	Td_dag.h
+    get_depth_threshold()
+    	Trapezoidal_decomposition_2.h
+    get_double()
+	Arr_lm_random_generator.h
+	Arr_point_location/Arr_lm_random_generator.h    
+    get_index() 
 	Arr_circle_segment_traits_2.h
 	Arr_conic_traits_2.h    
-    get_data
-    	Td_dag.h
-    get_level
+    get_intersections()
+    get_lb()
+	Td_X_trapezoid.h
+	Trapezoidal_decomposition_2.h
+    get_level()
 	Arr_qdx_topology_traits_2_impl.h
 	Arr_torus_topology_traits_2_impl.h    
-    get_lb
+    get_lt()
 	Td_X_trapezoid.h
 	Trapezoidal_decomposition_2.h
-    get_lt
-	Td_X_trapezoid.h
-	Trapezoidal_decomposition_2.h
-    get_node
+    get_mode()
+    get_node()
 	Td_X_trapezoid.h
 	Trapezoidal_decomposition_2.h    
-    get_parent
+    get_originator()
+    get_painter()
+    get_parent()
 	Arr_trapezoid_ric_pl_impl.h
 	Trapezoidal_decomposition_2.h
 	Arr_trapezoid_ric_point_location.h
-    get_rb
+    get_rb()
 	Td_X_trapezoid.h
 	Trapezoidal_decomposition_2.h    
-    get_rt
+    get_rt()
 	Td_X_trapezoid.h
 	Trapezoidal_decomposition_2.h    
-    get_depth_threshold
+    get_size_threshold()
     	Trapezoidal_decomposition_2.h
-    get_size_threshold
-    	Trapezoidal_decomposition_2.h
-    get_y
-    get_double
-	Arr_lm_random_generator.h
-	Arr_point_location/Arr_lm_random_generator.h    
+    get_t_at_x()
+    get_t_at_y()
+    get_traits()
+    get_vertical_tangencies()
 
 - Add insert_* functions back for backward compatibility.
   Keep the old interface for backward complatibility (at least for CGAL 3.4,
@@ -77,16 +87,6 @@
   operation to perform (just like we do now in insert() ).
 
 - Spherical arcs
-  - Rewrite the spherical helper class for the vertical-decomposition sweep-
-    line visitor (current one is not good enough).
-    Regarding the helper class for the spherical case, we currently return the
-    "north face" in case we "see" nothing above - which is OK - but we also
-    return the "north face" in case we see nothing from *below*. This is wrong:
-    we should really keep track of the "south face" and return it as the
-    "bottom" object. To conclude, this helper needs more work. It is not top
-    priority, but the quick-and-dirty helper that I wrote needs to become a bit
-    more complicated ...
-
   - The insertion helper and the batched point-location helper seem to have
     been copied from the planar helpers with minor changes. That is, I
     expect to face problem while aggregately inserting new curves into a
@@ -150,3 +150,24 @@
   Now zoom in, and oops, you see the two input objects again.
   I would expect to zoom into the intersection.
 
+- The arrangement demo fails with conics.
+
+- There is a warning coming from Cartesian/function_objects.h line 3113
+  about returning a reference to a temporary variable (which seems to be
+  a good warning; perhaps it is the source of some segmentation faults we
+  encounter). A "kernel expert" should look into this.
+- In the example dual_lines.cpp we use the function rand().
+  We should include <stdlib.h> to avoid a compilation error.
+- The example circular_line_arcs.cpp does not compile under many platforms,
+  or at least issues warnings about returning a reference to temporary
+  variable. Can you prompt the INRIA people to fix this?
+  (I personally think that we should remove this example from our test-suite,
+   but if the INRIA people believe that it's place is there, they should at
+   least properly maintain it ...)
+- There is a problem with the examples that use CORE on Darwin (platform #10).
+  Other Darwin platforms seem fine. Do we want to investigate? (perhaps it's
+  just something wrong with the installation ...)
+- There is a segmentation fault in the examples that use overlay on platforms
+  #10 and #12. Here I don't have a clue ...
+- There are still some mysterious crashes of the test-suite on some platforms.
+  Again, I don't have a clue ...