diff --git a/TODO b/TODO
index 591706c..7cd3fdf 100644
--- a/TODO
+++ b/TODO
@@ -52,6 +52,10 @@
 
 * Aggregator
 
+- Flush the requests' list when exiting.
+- Rename ap_check_interval to something more meaningful
+   Something like autocalibration_order_interval.
+- Test for the maximum verbose level.
 - -o should be optional.
 - Add an option to (not) flush the output file.
 - Outputs should include all the timestamps
@@ -59,6 +63,7 @@
    timestamp and the reception timestamp on the aggregator. This would
    help the Positioner's --replay option (to be adapted to use the
    aggregation time instead of the request time).
+- Allow a different aggregation timeout for each request type.
 - Refactoring:
    ° monitor_requests()
    ° got_request()
@@ -78,6 +83,8 @@
    using both -D and -A at the same time makes the program to block on
    the first thread. This is a known issue of uClibc:
    https://dev.openwrt.org/ticket/4809
+   ° With autocalibration on, all the APs declared in listeners.csv must
+   be in coverage or the reference points will not be generated.
 - Better handling of retried packets
    Currently we ignore any packet with the Retry bit. This can lead to
    completely ignore the given packet (or even request) if the original
@@ -134,6 +141,8 @@
    report, Fig. 2.6 p. 38 and explanations pp. 38-39).
 
 - Autocalibration
+   ° Allow to generate a list of reference points instead of using a
+   regular meshing.
    ° Generate reference points in 3D.
    ° To select the reference APs, we should use the distance along with
    the angle and coverage.
@@ -144,6 +153,13 @@
    ° Option z-level-number: the Z coordinate represents the number of
    the building's level. If unactivated, the topology is used to
    determine a change of level.
+   ° Generated CalibrationRequest have always nb_packets == 1. It is
+   tricky to set a number of packets for generated requests, since the
+   APs can transmit a different number of packets in their
+   autocalibration requests. A solution could be to use the biggest
+   number amongst the reference autocalibration requests used. A simpler
+   solution could be to assume that all the APs transmit the same number
+   of packets.
 
 - Refactoring
    ° Split Stock::generate_reference_point() into several functions.