diff --git a/TODO b/TODO
index 8a8e9be3..82542ca6 100644
--- a/TODO
+++ b/TODO
@@ -77,11 +77,13 @@ Legend:
  - automatic generation of usage_text from commands
  / upgrade (eray)
    + upgrade operation
-   / test upgrade op
+   + test upgrade op
    - system-wide upgrade (upgrade-all) komutu
  / multiple package repository (eray)
    + decide how to implement
    / make a package and sourcedb for each repo
+     + packagedb
+     - sourceb
    - support medium types :( uhuuuu
      - internet: http/ftp
      - local repository
@@ -95,16 +97,19 @@ Legend:
    - upgrade
  - partial caching and automatic resume for file download (meren)
   - use a separate "partial/" subdir like urpmi
- - exception handling (baris)
+ / exception handling (baris)
+   / better/more sensible exception hierarchy (eray)
+   ? recovery from exceptions where necessary
  - incremental build/fetch for repository index (pisi-index.xml)
    - diffsets (caglar)
  / component/category
    + requirements
    - xml format (baris) (bunlarin class'leri yazilmali)
    - usage (build process'in icine koymak baris - meren)
- + query
+ / query
    - comar OM information (Provides)
-   - package by name, summary/description
+   + package by name, summary/description
+   - files (rpm -ql)
  - actionsAPI documentation, unittests (caglar - meren)
  / versioning information document
  / verify metodlari
@@ -117,8 +122,8 @@ Legend:
    + package (baris)
    + configuration file (baris)
  - non-interactive use (baris)
- - incremental build (meren)
-   - generate binary release number by comparing MD5s (meren)
+ + incremental build (eray)
+   + generate binary release number by comparing MD5s (eray)
    + keep track of successfully completed configure, make, install
      steps (necessary for large-scale builds?) (meren)
  + database locking bugs (eray)