diff --git a/upload_nodes.admin.inc b/upload_nodes.admin.inc
index e46206f..88da57c 100644
--- a/upload_nodes.admin.inc
+++ b/upload_nodes.admin.inc
@@ -205,5 +205,3 @@ function upload_nodes_admin_edit_form_submit($form, &$form_state) {
 		$form_state['redirect'] = 'admin/config/media/upload-nodes';
   }
 }
-
-?>
diff --git a/upload_nodes.module b/upload_nodes.module
index 54314a3..8ee172c 100644
--- a/upload_nodes.module
+++ b/upload_nodes.module
@@ -70,8 +70,8 @@ function _upload_nodes_rebuild_targets() {
   foreach ($managed_targets as $key => $managed_target) {
     if (isset($manageable_targets[$key])) {
       $targets[$key] = $manageable_targets[$key];
-      if (isset($managed_target[$key]['settings']))
-        $targets[$key]['settings'] = $managed_target[$key]['settings'];
+      if (isset($managed_target['settings'])) 
+        $targets[$key]['settings'] = $managed_target['settings'];
     }
   }
 
@@ -335,20 +335,20 @@ function _upload_remove_unwanted_fields(&$form, $target, $setting, $default) {
   // Remove fields
   foreach (field_info_instances('node', $target['type_name']) as $key => $field_info_instance)
     if (isset($form[$key]))
-      if (isset($target['settings']['fields'][$key]))
-        if ($target['settings']['fields'][$key][$setting])
-          unset($form[$key]);
+      if (isset($target['settings']['fields'][$key])) 
+        if ($target['settings']['fields'][$key][$setting] == 0) 
+          $form[$key]['#access'] = FALSE;
       else
         if (!$default)
-          unset($form[$key]);
+          $form[$key]['#access'] = FALSE;
 
   // Remove title if needed
   if (isset($target['settings']['fields']['title']))
     if ($target['settings']['fields']['title'][$setting])
-      unset($form['title']);
+      $form['title']['#access'] = FALSE;
   else
     if (!$default)
-      unset($form['title']);
+      $form['title']['#access'] = FALSE;
 }
 
 /**
@@ -414,7 +414,7 @@ function upload_nodes_upload_form($form, &$form_state, $type_name, $field_name)
     drupal_not_found();
     return;
   }
-
+  
   // Create new node if needed
 	if (!isset($form_state['node'])) {
     $node = new StdClass();	  
@@ -508,8 +508,9 @@ function upload_nodes_upload_form_submit($form, &$form_state) {
 
       // Move file into Drupal
 	    $source = $uploaded_file['tmppath'];
+	    $destination = $destination_dir . $uploaded_file['name'];
 
-	    $destination = file_unmanaged_move($source, $destination_dir, FILE_EXISTS_RENAME);
+	    $destination = file_unmanaged_move($source, $destination, FILE_EXISTS_RENAME);
 	    $file = file_uri_to_object($destination);
 
 	    if ($target['field_type'] == 'file') {
@@ -720,6 +721,4 @@ function upload_nodes_test_view() {
   $node_form = node_form(array(), $form_state, $node);
   $output .= '<h2>node_form[field_test]</h2><pre>' . print_r($node_form['field_test'], true) . '</pre>';
   return $output;
-}
-
-?>
+}
\ No newline at end of file