@@ -196,51 +196,42 @@ public boolean create(){
     public boolean delete(){
         return Directory.delete();
     }
-    
-    
+
+
   //**************************************************************************
   //** Copy To
   //**************************************************************************
-  /**  Used to copy a directory to another directory */
-    
+  /** Used to copy a directory to another directory. Returns a list of any 
+   *  files that failed to copy.
+   */
     public String[] copyTo(Directory Destination, boolean Overwrite){
-        
-      //Set Local Variables
+
         int source = toString().length();
         String destination = Destination.toString();
-        java.util.Vector vec = new java.util.Vector();
+
+      //Create new folder
+        if (!Destination.exists()) Destination.create();
 
-      //Create Directories
-        Directory[] Directories = getSubDirectories(true);
-        for (int i=0; i<Directories.length; i++){
-             new Directory(destination + Directories[i].toString().substring(source)).create();
+      //Create subdirectories
+        for (Directory dir : getSubDirectories(true)){
+             new Directory(destination + dir.toString().substring(source)).create();
         }
 
-      //Create Files
-        File[] Files = getFiles(true);
-        for (int i=0; i<Files.length; i++){
-             String FilePath = Files[i].toString();
+      //Copy files
+        java.util.ArrayList<String> failures = new java.util.ArrayList<String>();
+        for (File file : getFiles(true)){
+             String FilePath = file.toString();
              File out = new File(destination + FilePath.substring(source));
 
-             boolean CopiedFile = Files[i].copyTo(out,Overwrite);
-             
-             if (CopiedFile==false){
-                 vec.add(FilePath);
-                 //System.out.println(FilePath);
-             }
+             boolean result = file.copyTo(out,Overwrite);
+             if (result==false) failures.add(FilePath);
         }
 
-      //Create Array
-        Object[] arr = vec.toArray();
-        String[] ret = new String[arr.length];
-        for (int i=0; i<ret.length; i++){
-             ret[i] = (String) arr[i];
-        }
-        
-        return ret;
+      //Return list of failed copies
+        return failures.toArray(new String[failures.size()]);
     }
-    
-    
+
+
   //**************************************************************************
   //** Move To
   //**************************************************************************
@@ -1456,9 +1447,18 @@ else if (obj instanceof java.io.File){
             return false;
         }
     }
-    
-   
-    
+
+
+  //**************************************************************************
+  //** clone
+  //**************************************************************************
+  /** Creates a copy of this object. */
+
+    public Directory clone(){
+        return new Directory(this.toString());
+    }
+
+
   //**************************************************************************
   //** getEvents
   //**************************************************************************
 
@@ -361,7 +361,8 @@ public javaxt.io.File moveTo(Directory Destination){
   //**************************************************************************
   //** Copy File
   //**************************************************************************
-  /**  Used to create a copy of this file.
+  /** Used to create a copy of this file. Returns true if the file was copied
+   *  successfully.
    */
     public boolean copyTo(Directory Destination, boolean Overwrite){
         return copyTo(new File(Destination, getName()), Overwrite);
@@ -371,7 +372,8 @@ public boolean copyTo(Directory Destination, boolean Overwrite){
   //**************************************************************************
   //** Copy File
   //**************************************************************************
-  /**  Used to create a copy of this file.
+  /** Used to create a copy of this file. Returns true if the file was copied
+   *  successfully.
    */
     public boolean copyTo(javaxt.io.File Destination, boolean Overwrite){
 
@@ -422,10 +424,12 @@ public boolean copyTo(javaxt.io.File Destination, boolean Overwrite){
   //**************************************************************************
   //** Rename File
   //**************************************************************************
-  /**  Used to rename a file - existing File Name is replaced with input
-   *   FileName. Note that this method is NOT equivalent to the java.io.File
-   *   "renameTo" method.
-   *   @param FileName The new file name (including the file extension).
+  /** Used to rename the file. The existing file name is replaced with a new
+   *  name. Only the file name is affected. The file path remains unchanged.
+   *  This method is therefore different from the java.io.File "renameTo"
+   *  method. If the operation is successful, returns a handle to the new file.
+   *  Otherwise, the original file is returned.
+   *  @param FileName The new file name (including the file extension).
    */
     public javaxt.io.File rename(String FileName){
         if (FileName!=null){
@@ -434,8 +438,9 @@ public javaxt.io.File rename(String FileName){
                 java.io.File File = getFile();
                 if (File!=null) {
                     java.io.File newFile = new java.io.File(getPath() + FileName);
-                    File.renameTo(newFile);
-                    file = newFile;
+                    if (File.renameTo(newFile)){
+                        file = newFile;
+                    }
                 }
             }
         }
@@ -933,6 +938,16 @@ public boolean equals(Object obj){
     }
 
 
+  //**************************************************************************
+  //** clone
+  //**************************************************************************
+  /** Creates a copy of this object. */
+
+    public File clone(){
+        return new File(this.toString());
+    }
+
+
   //**************************************************************************
   //** IsValidPath -- NOT USED!
   //**************************************************************************