diff --git a/TODO b/TODO
index 60622f7c72..438b644035 100644
--- a/TODO
+++ b/TODO
@@ -31,7 +31,7 @@ Fedora 20:
 
 CGroup Rework Completion:
 
-* introduce "mainpid" for scopes
+* introduce "mainpid" for scopes (or maybe not?)
 
 * implement system-wide DefaultCPUAccounting=1 switch (and similar for blockio, memory?)
 
@@ -39,8 +39,6 @@ CGroup Rework Completion:
 
 * handle jointly mounted controllers correctly
 
-* logind: implement session kill exceptions
-
 * make BlockIODeviceWeight=, BlockIODeviceBandwidth= runtime settable
 
 * introduce high-level settings for RT budget, swappiness
@@ -49,6 +47,12 @@ CGroup Rework Completion:
 
 Features:
 
+* unlink PID files of units after exit
+
+* tiny tool that saves/restores backlight
+
+* systemctl status output should should include list of triggering units and their status
+
 * for transient units, instead of writing out drop-ins for all properties consider serializing them in the normal serialization stream
 
 * logind: when logging out, remove user-owned sysv and posix IPC objects