diff --git a/TODO b/TODO
index 4f9f6633..2ffa3b10 100644
--- a/TODO
+++ b/TODO
@@ -94,9 +94,12 @@ Legend:
    + requirements
    + xml format, add to PSPEC
    + index component.xml's and make use of them in build
-   - query components: list of components/packages in a component
+   - a database of components: 
+     - query components by name
+     - query list of packages in a component
+     - index: update component database(s)
    - install/remove components
-   - safety switch: preserve system:base, install system:devel for build, etc. 
+   - safety switch: preserve system.base, install system.devel for build, etc. 
  + multiple package repository (eray)
    + decide how to implement
    + support repo order
@@ -194,7 +197,6 @@ Legend:
    - build-all (or build-distro) command
    - an emerge command, just for fun
  - more support for categories:
-   - a database of components: faster access
    - put categories into a database
    - fast search for categories
  / make a package and sourcedb for each repo