diff --git a/TODO b/TODO
index 8850be8aab177ce02ae97a691b2cd94344640229..b9a1ea621a7bc3c92a301358dee9e8fd0e13bdc9 100644
--- a/TODO
+++ b/TODO
@@ -16,38 +16,27 @@ Version 1.5.0:
 * Finish library implementation.
   - Remove stdio uses?
 * Rescan command.
-* Change SDO index at runtime for SDO request.
-* Output skipped datagrams again.
-* Output warning when send_ext() is called in illegal context.
-* Implement CompleteAccess for SDO uploads.
-* Check for Enable SDO Complete Access flag.
-* Remove allow_scanning flag.
 * ethercat tool:
     - Output error after usage.
-    - Data type abbreviations.
     - Implement ranges for slaves and domains.
-    - Add -x switch for hex display.
-    - Implement CompleteAccess
-    - Implement --output-file argument in foe_read.
-    - Fix arguments of reg_read.
-    - Number layout for reg_read.
-    - Implement indent in 'ethercat ma'
-    - Implement 0xXXXX:YY format for specifying SDOs.
-    - Implement reading from stream for soe_write.
-    - Fix AL state display if error bit set.
-* recompile tool/CommandVersion.cpp if revision changes.
-* Log SoE IDNs with real name ([SP]-x-yyyy).
-* Output SoE IDN configurations in 'ethercat config'.
 * Fix casting away constness during expected WC calculation.
-* Read AL status code on spontaneous state change.
-* Fix clearing domains etc. when not activated and releasing.
-* Only output watchdog config if not default.
-* Do not output 'SDO does not exist' when querying data type.
-* Always write down PDO assignment/mapping in doubt? If not, add an interface
-  for enforcing this.
 
 Future issues:
 
+* Remove allow_scanning flag.
+* Output skipped datagrams again.
+* Check for Enable SDO Complete Access flag.
+* Do not output 'SDO does not exist' when querying data type.
+* Always write down PDO assignment/mapping in doubt? If not, add an interface
+  for enforcing this.
+* Read AL status code on spontaneous state change.
+* recompile tool/CommandVersion.cpp if revision changes.
+* Log SoE IDNs with real name ([SP]-x-yyyy).
+* Output SoE IDN configurations in 'ethercat config'.
+* Only output watchdog config if not default.
+* Implement CompleteAccess for SDO uploads.
+* Output warning when send_ext() is called in illegal context.
+* Change SDO index at runtime for SDO request.
 * Implement ecrt_slave_config_request_state().
 * Remove default buffer size in SDO upload.
 * Override sync manager size?
@@ -80,6 +69,13 @@ Future issues:
     - Add a -n (numeric) switch.
 	- Check for unwanted options.
     - Fix number of digits in negative integer hex output.
+    - Data type abbreviations.
+    - Add -x switch for hex display.
+    - Implement CompleteAccess
+    - Implement --output-file argument in foe_read.
+    - Implement indent in 'ethercat ma'
+    - Implement 0xXXXX:YY format for specifying SDOs.
+    - Implement reading from stream for soe_write.
 * Simplify master fsm by introducing a common request state to handle external
   requests (replace write_sii, sdo_request, etc).
 * Write PDO mapping/assignment by default?