diff --git a/TODO b/TODO
index 2ae0db16..94e9deb6 100644
--- a/TODO
+++ b/TODO
@@ -13,26 +13,60 @@ Legend:
 
 1. Pre-Alpha
 
- + implement reading spec file
- + implement writing
-   / files
-   - metadata
- + implement Actions API framework
-   / sample api modules (autotools)
-   - unit test
- + implement source building
- / implement package module
-   / extraction
-   - add file / compression
-   - unit test
- / implement package creation
- + implement install database
- / implement package database
- - implement source database
- / implement dependency analysis
- ? transaction/locking for database
+ + reading spec file
+ + writing
+   + files
+   + metadata
+ + Actions API framework
+   + sample api modules (autotools)
+   + unit test
+ + source building
+ + package module
+   + extraction
+   + add file / compression
+ + package creation
+ + install database
+ + package database
+ + command line interface
+   + pisi-build
+   + pisi-install
+   + pisi-index
+   + pisi-updatedb
+ + single repository index
+ + simple dependency checking
+ + Package/Files
 
 2. Alpha
- - implement writing specfile
+ + write specfile
+ ? transaction/locking for database
+ + command line interface:
+   - multi-package installation
+   - pisi-remove
+   - pisi-upgrade
+   ? svn-like CLI
+ - multi-package dependency analysis
+ - implement source database
+ - implement missing unit tests
+   - package
+ - multi-architecture support
+   - design decisions
+   - extend XML specs to support that
+   - cross-platform building support
+ - non-interactive use
+ - query
+   - list of installed packages
+   - comar OM information (Provides)
+ - easy package preparation
+   ? PISIMAT
+   ? convert ebuild to pisi
+ - COMAR interface
+   - package install: register config script
+   - package remove: unregister config script
+ - internet installation
+   - support URI's whereever a filename is supported
+   - http server
+   - pisi updatedb over internet
+ - multiple package repository
+   - decide how to implement
 
 3. Beta
diff --git a/pisi-updateindex b/pisi-updatedb
similarity index 100%
rename from pisi-updateindex
rename to pisi-updatedb
diff --git a/pisi/config.py b/pisi/config.py
index 47f5ad3e..24baf744 100644
--- a/pisi/config.py
+++ b/pisi/config.py
@@ -1,6 +1,9 @@
 # PISI Configuration module is used for gathering and providing
 # regular PISI configurations.
 
+# Authors: Baris Metin <baris@uludag.org.tr
+#          Eray Ozkural <eray@uludag.org.tr>
+
 #TODO: Eventually PISI will have a configuration file (located in
 #/etc/pisi/conf?) and this module will provide access to those
 #configuration parameters.
@@ -8,6 +11,7 @@
 from constants import const
 import os
 
+
 class Config(object):
     """Config Singleton"""
     
diff --git a/pisi/constants.py b/pisi/constants.py
index 58fe1a6c..8731ee2f 100644
--- a/pisi/constants.py
+++ b/pisi/constants.py
@@ -2,6 +2,8 @@
 # If you have a "magic" constant value this is where it should be
 # defined.
 
+# Author: Baris Metin <baris@uludag.org.tr
+
 class _constant:
     "Constant members implementation"
     class ConstError(TypeError):
diff --git a/pisi/context.py b/pisi/context.py
index 0d3502b1..834f3159 100644
--- a/pisi/context.py
+++ b/pisi/context.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # Context module.
+# Authors: Baris Metin <baris@uludag.org.tr
+#          Eray Ozkural <eray@uludag.org.tr>
 
 from specfile import SpecFile
 from constants import const
diff --git a/pisi/dependency.py b/pisi/dependency.py
index 0559eb8d..2cca017f 100644
--- a/pisi/dependency.py
+++ b/pisi/dependency.py
@@ -1,4 +1,6 @@
 # dependency analyzer
+# Author:  Eray Ozkural <eray@uludag.org.tr>
+
 # maintainer: eray and caglar
 
 import installdb
diff --git a/pisi/files.py b/pisi/files.py
index b70cc046..05c087c8 100644
--- a/pisi/files.py
+++ b/pisi/files.py
@@ -1,10 +1,10 @@
 # Files module provides access to files.xml. files.xml is genarated
 # during the build process of a package and used in installation.
+# Authors:  Eray Ozkural <eray@uludag.org.tr>
 
 from xmlext import *
 from xmlfile import XmlFile
 
-
 class FileInfo:
     """FileInfo holds the information for a File node/tag in files.xml"""
     def __init__(self, _path = "", _type = "", _size="", _hash = ""):
diff --git a/tests/prealpha.sh b/tests/prealpha.sh
index 7249409d..e757d75a 100755
--- a/tests/prealpha.sh
+++ b/tests/prealpha.sh
@@ -4,7 +4,7 @@ pwd
 rm -rf tmp
 ./pisi-build samples/*/*.pspec
 ./pisi-index .
-./pisi-updateindex pisi-index.xml
+./pisi-updatedb pisi-index.xml
 ./pisi-install start*pisi
 ./pisi-install popt*pisi
 find tmp -iname '*.bdb' | xargs ./cat-db.py