diff --git a/bds/source/java/ch/systemsx/cisd/bds/ExperimentIdentifier.java b/bds/source/java/ch/systemsx/cisd/bds/ExperimentIdentifier.java
index b07bd1dd719c87304fa80aeb3585107024c41146..94a3493dd59eb368756e4eae4e15cc83e8aec529 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/ExperimentIdentifier.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/ExperimentIdentifier.java
@@ -75,6 +75,7 @@ public class ExperimentIdentifier implements IStorable
     /**
      * Returns the group code;
      */
+    // TODO 2007-12-03 Tomasz Pylak review: should not we use the term organization as everywhere else instead of group?
     public final String getGroupCode()
     {
         return groupCode;
diff --git a/bds/source/java/ch/systemsx/cisd/bds/storage/IDirectory.java b/bds/source/java/ch/systemsx/cisd/bds/storage/IDirectory.java
index 90195b000292a95ff8ac40e51822b84860f757c9..4965eb31033309e364bfae27f6053364129fd3f9 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/storage/IDirectory.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/storage/IDirectory.java
@@ -48,6 +48,9 @@ public interface IDirectory extends INode, Iterable<INode>
      * @return the new node. It will be a {@link ILink} if <code>file</code> is a symbolic link, a {@link IDirectory}
      *         if <code>file</code> is a folder, or {@link IFile} if <code>file</code> is a plain file.
      */
+    // TODO 2007-12-03 Tomasz Pylak review: this generic interface should not use java.io.File. Is the 'move' parameter
+    // possible to implement in HDF5? Maybe those operations should be done before, depending on the implementation
+    // which is used?
     public INode addFile(final File file, final boolean move);
 
     /**
diff --git a/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/File.java b/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/File.java
index 791d86e882814a8ad46a91df6829109cf937705d..22cf9aab659e046801acb854b94c71b9def716ca 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/File.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/File.java
@@ -34,6 +34,7 @@ import ch.systemsx.cisd.common.utilities.FileUtilities;
  * 
  * @author Franz-Josef Elmer
  */
+// TODO 2007-12-03 Tomasz Pylak review: Name of this class should be changed, it's very confusing
 final class File extends AbstractNode implements IFile
 {
     File(final java.io.File file)
diff --git a/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/ILinkMaker.java b/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/ILinkMaker.java
index 81d1e80d612ae4b0cd955fe8f678803cee5f6cf1..ca8995183b8f5b7e8b56cc53d1f799cf1520ff9b 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/ILinkMaker.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/storage/filesystem/ILinkMaker.java
@@ -42,6 +42,7 @@ public interface ILinkMaker
             public final File tryCreateLink(final File file, final File destDir, final String nameOrNull)
                     throws EnvironmentFailureException
             {
+                // TODO 2007-12-03 Tomasz Pylak review: should not we just make a copy here? 
                 return null;
             }
         };