diff --git a/TODO b/TODO
index bb79957..270e4ca 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,6 @@
 * Global
 
-- Change the format of aggregated requests
-   owl_request & owl_request_info must be updated to allow
-   transmission of (auto)calibration requests from the aggregator to
-   the positioning server.
+- Use -D DEBUG in makefiles instead of #defines.
 - Use string for network exchanges?
 - Mark arguments as const in function headers if needed
    That is done in the owlps-positioning C++ code, but not constantly
@@ -42,9 +39,13 @@
 
 * Listener
 
+- Send coordinates in autocalibration requests
+   The listener should be able to know its own position and transmit
+   it in autocalibration requests.
 - read_packet(): use ieee80211_header_size for all implicit packets
    Currently the size is corrected only for data packets.
 - Fix segfault when rtap_iface is not in monitor mode (?) on Foneras.
+- Move endianess #defines in libowlps?
 - Merge Makefile and Makefile_atheros?
    Use autohell?
 - Use positive (USE_CONFUSE) and negative (NO_USE_PTHREAD) options?
diff --git a/owlps-positioning/TODO b/owlps-positioning/TODO
index 31c5821..82cc2b9 100644
--- a/owlps-positioning/TODO
+++ b/owlps-positioning/TODO
@@ -1,4 +1,12 @@
 
+- Fix Makefile
+   The 'prepare' target *must* be called before the *.o targets.
+
+- Write a class for Request::type?
+   CalibrationRequest::direction uses a dedicated class Direction, why
+   not Request::type? That would simplify writing of the type to
+   streams (no need to cast each time anymore).
+
 - Interface utilisateur
    ° Pour plus de souplesse, comparer les chaînes sans tenir compte de
    la casse.