diff --git a/TODO b/TODO
index a4289289..47f6d4f4 100644
--- a/TODO
+++ b/TODO
@@ -90,36 +90,13 @@ Legend:
    + requirements
    / xml format
    - query components: list of components/packages in a component
-   - install/remove components 
- / multiple package repository (eray)
+   - install/remove components
+   - safety switch: preserve system:base, install system:devel for build, etc. 
+ + multiple package repository (eray)
    + decide how to implement
    + support repo order
-   - support medium types
-     - internet: http/ftp
-     - local repository: file://
-     - removable media: media://
  - a helper script for finding dependencies (eray)
- 
- * low priority 
- 
- - search command: (eray)
-    - implement an inverted index (if there's a good one, just use it)
-    - search in either summary, or description
-    - english stemming
-    - turkish stemming
-    - phonetic/syntactic fault tolerance (whichever works!)
-      - in particular evaluate soundex and metaphone
-      - research if there are language independent phonetic encodings
-      - implement as an option (or make it possible to turn it off if it works well :))
-    - fault tolerant search in package names (bir sekilde)
- / overhaul installdb (try to merge its use with packagedb) (eray)
- / verify metodlari
-   + SpecFile
-   + MetaData
-   + Files
-   - Index (o kadar onemli degil)
- ? non-interactive use (baris)
- 
+
  * finished tasks
 
  + partial caching and automatic resume for file download (meren)
@@ -175,7 +152,31 @@ Legend:
      steps (necessary for large-scale builds?) (meren)
  + database locking bugs (eray)
 
-4. Release (bug fix, guzellestirme vs.)
+4. Release
+
+ * low priority 
+ 
+ - improve url support, it's a little dumb at the moment
+   - devise a File class that works with URLs
+   - consider adding "other" protocols
+     - removable media: media://
+ - search command: (eray)
+   - implement an inverted index (if there's a good one, just use it)
+   - search in either summary, or description
+   - english stemming
+   - turkish stemming
+   - phonetic/syntactic fault tolerance (whichever works!)
+     - in particular evaluate soundex and metaphone
+     - research if there are language independent phonetic encodings
+     - implement as an option (or make it possible to turn it off if it works well :))
+   - fault tolerant search in package names (bir sekilde)
+ / overhaul installdb (try to merge its use with packagedb) (eray)
+ / verify metodlari
+   + SpecFile
+   + MetaData
+   + Files
+   - Index (o kadar onemli degil)
+ ? non-interactive use (baris)
 
 5. Post Release
 
@@ -197,4 +198,4 @@ Legend:
    - cross-platform building support
  - incremental build/fetch for repository index (pisi-index.xml)
    - diffsets (caglar)
-   
+