diff --git a/inc/Services/Parameter.hpp b/inc/Services/Parameter.hpp
index a63d846b5824a1aa58ea50298d2176fe3000e5c6..2cec0f88e2795f3b56b24d401d34f80feb88127b 100644
--- a/inc/Services/Parameter.hpp
+++ b/inc/Services/Parameter.hpp
@@ -20,6 +20,7 @@
  * @typedef ParamId: the unique ID of a parameter, used for searching
  * @typedef ValueType: the type of the parameter's value (changing types is WIP)
  * @typedef UpdatePtr: pointer to a void function, with a single ValueType* argument (return address)
+ * @typedef Flags: container for the binary flags
  */
 typedef uint16_t ParamId;
 typedef uint32_t ValueType;
@@ -38,7 +39,7 @@ typedef etl::bitset<NUM_OF_FLAGS> Flags;
  *
  * Additional features (not included in standard):
  * @private flags: Various binary flags (number and meaning TBD).
- * Current flag meanings (starting from LSB, big-endian):
+ * @warning Current flag meanings (starting from LSB, big-endian):
  * Index 0: update with priority
  * Index 1: manual update available
  * Index 2: automatic update available
diff --git a/inc/Services/ParameterService.hpp b/inc/Services/ParameterService.hpp
index 0338d76d0a45a51467f18c1457f52276476a9658..49a591b837ac8cb748d4a37ee7e95e245000f20d 100644
--- a/inc/Services/ParameterService.hpp
+++ b/inc/Services/ParameterService.hpp
@@ -9,10 +9,8 @@
 
 // Number of stored parameters. MAX_PARAMS is just a dummy number for now.
 #define MAX_PARAMS 5
-// TODO: 2) Implement flags and use them above
 // TODO: 3) Write more and better tests
 // TODO: 4) Make sure that docs are up to date
-// TODO: 5) Optimize stuff if possible
 
 /**
  * Implementation of the ST[20] parameter management service,