diff --git a/drupal_jeditable.js b/drupal_jeditable.js
index 5fae824..879339e 100644
--- a/drupal_jeditable.js
+++ b/drupal_jeditable.js
@@ -5,22 +5,66 @@
         indicator : 'Saving...',
         tooltip   : 'Click to edit...',
         cancel    : 'Cancel',
-        submit    : 'Save',
-        style     : 'display: inline; min-width: 100px;'
+        // onblur    : 'submit',
+        submit    : 'Save'
+        // style     : 'display: inline; min-width: 100px;'
       });
       $('.jeditable-textarea', context).editable('/jeditable/ajax/save', { 
         type      : 'textarea',
         cancel    : 'Cancel',
         submit    : 'OK',
         indicator : 'Saving...',
+        // onblur    : 'submit',
         tooltip   : 'Click to edit...'
       });
       $('.jeditable-select', context).editable('/jeditable/ajax/save', { 
         loadurl  : '/jeditable/ajax/load',
         type     : 'select',
         submit   : 'OK',
+        indicator : 'Saving...',
+        // onblur    : 'submit',
+        cancel    : 'Cancel',
+        tooltip   : 'Click to edit...',
+        style    : 'display: inline'
+      });
+      $('.jeditable-checkbox', context).editable('/jeditable/ajax/save', { 
+        loadurl  : '/jeditable/ajax/load',
+        type     : 'checkbox',
+        submit   : 'OK',
+        indicator : 'Saving...',
+        // onblur    : 'submit',
+        cancel    : 'Cancel',
+        tooltip   : 'Click to edit...',
+        style    : 'display: inline'
+      });
+      $('.jeditable-radio', context).editable('/jeditable/ajax/save', { 
+        loadurl  : '/jeditable/ajax/load',
+        type     : 'radio',
+        submit   : 'OK',
+        indicator : 'Saving...',
+        // onblur    : 'submit',
+        cancel    : 'Cancel',
+        tooltip   : 'Click to edit...',
+        style    : 'display: inline'
+      });
+      $('.jeditable-datetime', context).editable('/jeditable/ajax/save', { 
+        loadurl  : '/jeditable/ajax/load',
+        type     : 'datetime',
+        submit   : 'OK',
+        indicator : 'Saving...',
+        // onblur    : 'submit',
+        cancel    : 'Cancel',
+        tooltip   : 'Click to edit...',
         style    : 'display: inline'
       });
+      $('.jeditable-upload', context).editable('/jeditable/ajax/save', { 
+        indicator : 'Saving...',
+        type      : 'ajaxupload',
+        submit    : 'Upload',
+        cancel    : 'Cancel',
+        tooltip   : 'Click to edit...',
+        submitdata : {row: "photo"}
+      });
     }
   };
 })(jQuery);
diff --git a/jeditable.css b/jeditable.css
index 70cf9c3..51f4833 100644
--- a/jeditable.css
+++ b/jeditable.css
@@ -1,11 +1,40 @@
-.jeditable-textarea form {
-  width: 100%;
-  display: block;
+.jeditable {
+	cursor:pointer;
+	display:block;
+	padding:0.3em;
+  margin:-0.3em; 
+	transition:background-color 0.2s ;
+	-webkit-transition:background-color 0.2s;
+  -moz-transition:background-color 0.2s;
+}
+
+.jeditable:hover {
+	background:#f6f6f2;;
+}
+
+.jeditable,
+.jeditable * {
+		box-sizing:border-box;
+}
+
+.jeditable button {
+	height:30px;
+	cursor:pointer;
+}
+
+.jeditable-textfield form input {
+	min-height:30px;
+	max-height:30px;
+	min-width:300px;
+	max-width:300px;
 }
 
 .jeditable-textarea form textarea {
-  min-height: 40px;
-  min-width: 100% !important;
-  display: block;
-  font-size: 0.9em;
-}
\ No newline at end of file
+	min-height:300px;
+	max-height:300px;
+	resize:none;
+}
+
+.jeditable-select form select {
+	min-height:30px;
+}
diff --git a/jeditable.info b/jeditable.info
index d799467..c0c3527 100644
--- a/jeditable.info
+++ b/jeditable.info
@@ -1,6 +1,7 @@
 name = jEditable
 description = Provides methods and field formatters for using the jEditable edit-in-place plugin
 dependencies[] = field
+dependencies[] = date
 package = User Interface
 core = 7.x
 
diff --git a/jeditable.module b/jeditable.module
index 4d53f04..fed5148 100644
--- a/jeditable.module
+++ b/jeditable.module
@@ -1,7 +1,13 @@
 <?php
+
 /**
  * @file jeditable.module
  * TODO: Provides integration between Drupal and the jEditable jquery plugin
+ * @todo: Datepicker support 
+ * @todo: Ajax upload support 
+ * @todo: Radioboxes/checkboxes support 
+ * @todo: add required handler for date
+ * @todo: add compatibility for taxonomy_term_reference on select & radios checkboxes
  */
 
 /**
@@ -45,7 +51,6 @@ function jeditable_admin_settings() {
     '#default_value' => variable_get('jeditable_empty_placeholder', '--'),
     '#description' => t('Text, that will be shown if field is empty'),
   );
-  
   return system_settings_form($form);
 }
 
@@ -66,28 +71,28 @@ function jeditable_permission() {
  */
 function jeditable_field_formatter_info() {
   $all_types = array_keys(field_info_field_types());
-//   print_r($all_types); die;
   return array(
     'jeditable_textfield' => array(
       'label' => t('jEditable textfield'),
-      'field types' => array('text', 'text_long', 'text_with_summary', 'number_integer', 'number_decimal', 'number_float', 'list_boolean', 'list_integer', 'list_float', 'list_text'),
+      'field types' => array('text', 'number_integer', 'number_decimal', 'number_float'),
       'settings' => array(
         'fallback_format' => NULL,
         'fallback_settings' => array(),
         'empty_text' => '--',
       ),
     ),
-    'jeditable_checkbox' => array(
-      'label' => t('jEditable checkboxes/radios [not working]'),
-      'field types' => array('list_boolean', 'list_integer', 'list_float', 'list_text'),
+    'jeditable_textarea' => array(
+      'label' => t('jEditable textarea'),
+      'field types' => array('text_long', 'text_with_summary'),
       'settings' => array(
         'fallback_format' => NULL,
         'fallback_settings' => array(),
         'empty_text' => '--',
       ),
     ),
+    // add support for 'taxonomy_term_reference'
     'jeditable_select' => array(
-      'label' => t('jEditable selectlist [not working]'),
+      'label' => t('jEditable selectlist'),
       'field types' => array('list_boolean', 'list_integer', 'list_float', 'list_text'),
       'settings' => array(
         'fallback_format' => NULL,
@@ -95,39 +100,73 @@ function jeditable_field_formatter_info() {
         'empty_text' => '--',
       ),
     ),
+    'jeditable_upload' => array(
+      'label' => t('jEditable upload [not working]'),
+      'field types' => array('image', 'file'),
+      'settings' => array(
+        'fallback_format' => NULL,
+        'fallback_settings' => array(),
+        'empty_text' => '--',
+      ),
+    ),
+    'jeditable_checkbox_radio' => array(
+      'label' => t('jEditable checkboxes/radios [not working]'),
+      'field types' => array('list_boolean', 'list_integer', 'list_float', 'list_text', 'taxonomy_term_reference'),
+      'settings' => array(
+        'fallback_format' => NULL,
+        'fallback_settings' => array(),
+      ),
+    ),
     'jeditable_nodereference' => array(
-      'label' => t('jEditable Nodereference'),
+      'label' => t('jEditable node reference [not working]'),
       'field types' => array('nodereference'),
     ),
     'jeditable_datetime' => array(
-      'label' => t('jEditable Datetime picker'),
+      'label' => t('jEditable datetime [not working]'),
       'field types' => array('datetime'),
+      'settings' => array(
+        'fallback_format' => NULL,
+        'fallback_settings' => array(),
+      ),
     ),
   );
 }
 
 /**
+ * @todo: field collection delta needs to be fixed --< field_delta line 153
  * Implements hook_field_formatter_view().
  */
 function jeditable_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, &$items, $display) {
   $path = drupal_get_path('module', 'jeditable');
   $elements = array();
   if(empty($items)) {
-    $items[0]['value']=variable_get('jeditable_empty_placeholder', '--');
+    $items[0]['value']=variable_get('jeditable_empty_placeholder', t('- None -'));
   }
   list($tmp,$widget_type)=explode('_',$display['type']);
-  
-  foreach ($items as $delta => $item) {
-    $field_delta=isset($display['views_field'])?$display['views_field']->options['delta_offset']+$delta:$delta;
-    $elements[$delta] = array(
-      '#markup' => theme('jeditable_formatter_jeditable', array('element' => $item, 'field' => $instance, 'entity' => $entity, 'entity_type' => $entity_type, 'widget_type' => $widget_type, 'delta' => $field_delta )),
-    );
 
+  switch($display['type']) {
+    case 'jeditable_textfield':
+    case 'jeditable_textarea':
+    case 'jeditable_select':
+    case 'jeditable_upload':
+    case 'jeditable_datetime':
+    case 'jeditable_checkbox_radio':
+      foreach ($items as $delta => $item) {
+        $field_delta=isset($display['views_field'])?$display['views_field']->options['delta_offset']+$delta:$delta;
+        $elements[$delta] = array(
+          '#markup' => theme('jeditable_formatter_' . $display['type'], array('element' => $item, 'field' => $instance, 'entity' => $entity, 'entity_type' => $entity_type, 'widget_type' => $widget_type, 'delta' => $field_delta )),
+        );
+      }
+      break;
+  }
+
+  foreach ($items as $delta => $item) {
     if (user_access('use jeditable')) {
       $elements[$delta]['#attached'] = array(
         'js' => array(
-          $path . '/jquery.jeditable.mini.js',
           $path . '/drupal_jeditable.js',
+          $path . '/jquery.jeditable.mini.js', 
+          // $path . '/jquery.jeditable.js', 
         ),
         'css' => array(
           $path . '/jeditable.css',
@@ -135,6 +174,7 @@ function jeditable_field_formatter_view($entity_type, $entity, $field, $instance
       );
     }
   }
+
   return $elements;
 }
 
@@ -152,15 +192,24 @@ function jeditable_views_api() {
  * Implements hook_theme().
  */
 function jeditable_theme() {
-  return array(
-    'jeditable_formatter_jeditable' => array(
+  $theme = array(
+    'jeditable_formatter_jeditable_textfield' => array(
+      'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'widget_type' => NULL, 'delta' => NULL),
+    ),
+    'jeditable_formatter_jeditable_textarea' => array(
       'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'widget_type' => NULL, 'delta' => NULL),
     ),
     'jeditable_formatter_jeditable_select' => array(
-      'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'delta' => NULL),
+      'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'widget_type' => NULL, 'delta' => NULL),
+    ),
+    'jeditable_formatter_jeditable_upload' => array(
+      'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'widget_type' => NULL, 'delta' => NULL),
     ),
     'jeditable_formatter_jeditable_datetime' => array(
-      'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'delta' => NULL),
+      'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'widget_type' => NULL, 'delta' => NULL),
+    ),
+    'jeditable_formatter_jeditable_checkbox_radio' => array(
+      'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'widget_type' => NULL, 'delta' => NULL),
     ),
     'jeditable_formatter_jeditable_nodereference' => array(
       'arguments' => array('element' => NULL, 'field' => NULL, 'entity' => NULL, 'entity_type' => NULL, 'delta' => NULL),
@@ -169,22 +218,22 @@ function jeditable_theme() {
       'arguments' => array('node' => NULL),
     ),
   );
-}
 
-/**
- * Returns the id fo
+  return $theme;
+}
 
 /**
  * Theme a text field as a jeditable textfield.
  *
  * @ingroup themeable
  */
-function theme_jeditable_formatter_jeditable($variables) {
+function theme_jeditable_formatter_jeditable_textfield($variables) {
   $element     = $variables['element'];
   $field       = $variables['field'];
   $entity      = $variables['entity'];
   $entity_type = $variables['entity_type'];
   $widget_type = $variables['widget_type'];
+  $delta       = $variables['delta'];
 
   switch ($entity_type) {
     case 'node':
@@ -192,10 +241,22 @@ function theme_jeditable_formatter_jeditable($variables) {
       if (!node_access('update', $entity)) {
         return $element['value'];
       }
-
       $id = $entity->nid;
       break;
 
+    case 'field_collection_item':
+      // user's access inherited from node.
+      $field_name = $entity->field_name;
+      $hostEntity = entity_load_single('field_collection_item',$entity->item_id)->hostEntity();
+      $id = $hostEntity->nid;
+      // override delta with field_collection's delta
+      foreach ($hostEntity->{$field_name}[$hostEntity->language] as $key => $val) {
+        if ($val['value'] == $entity->item_id) {
+          $delta = $key;
+        }
+      }
+      break;
+
     case 'user':
       // Check user's access to editing this user.
       if (!user_edit_access($entity)) {
@@ -204,9 +265,10 @@ function theme_jeditable_formatter_jeditable($variables) {
       $id = $entity->uid;
       break;
   }
+
   if(strpos($field['field_name'],'field_')===0) $entity_type='field';
 
-  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $variables['delta'] . '" class="jeditable jeditable-textfield">' . $element['value'] . '</span>';
+  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $delta . '" class="jeditable jeditable-' . $widget_type . '">' . $element['value'] . '</span>';
 }
 
 /**
@@ -219,6 +281,8 @@ function theme_jeditable_formatter_jeditable_textarea($variables) {
   $field       = $variables['field'];
   $entity      = $variables['entity'];
   $entity_type = $variables['entity_type'];
+  $widget_type = $variables['widget_type'];
+  $delta       = $variables['delta'];
 
   switch ($entity_type) {
     case 'node':
@@ -226,10 +290,22 @@ function theme_jeditable_formatter_jeditable_textarea($variables) {
       if (!node_access('update', $entity)) {
         return $element['value'];
       }
-
       $id = $entity->nid;
       break;
 
+    case 'field_collection_item':
+      // user's access inherited from node.
+      $field_name = $entity->field_name;
+      $hostEntity = entity_load_single('field_collection_item',$entity->item_id)->hostEntity();
+      $id = $hostEntity->nid;
+      // override delta with field_collection's delta
+      foreach ($hostEntity->{$field_name}[$hostEntity->language] as $key => $val) {
+        if ($val['value'] == $entity->item_id) {
+          $delta = $key;
+        }
+      }
+      break;
+
     case 'user':
       // Check user's access to editing this user.
       if (!user_edit_access($entity)) {
@@ -239,13 +315,15 @@ function theme_jeditable_formatter_jeditable_textarea($variables) {
       break;
   }
   
-  if($entity_type == 'node') $entity_type='field';
+  // if($entity_type == 'node') $entity_type='field';
 
-  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $variables['delta'] . '" class="jeditable jeditable-textarea">' . $element['value'] . '</span>';
+  if(strpos($field['field_name'],'field_')===0) $entity_type='field';
+
+  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $delta . '" class="jeditable jeditable-' . $widget_type . '">' . $element['value'] . '</span>';
 }
 
 /**
- * Theme a CCK text field as a jeditable textarea.
+ * Theme a CCK text field as a jeditable nodereference.
  *
  * @ingroup themeable
  */
@@ -256,40 +334,93 @@ function theme_jeditable_formatter_jeditable_nodereference($element) {
   return '<span id="field-' . $id . '-' . $field . '" class="jeditable-select">' . $node->title . '</span>';
 }
 
+
+
 /**
- * Theme a CCK text field as a jeditable textfield.
+ * Theme a boolean_list field as a jeditable checkbox or radio button.
  *
  * @ingroup themeable
  */
-function theme_jeditable_formatter_jeditable_datetime($element) {
-  $id = $element['#node']->nid;
-  $field = $element['#field_name'];
-  return '<span id="field-' . $id . '-' . $field . '" class="jeditable-textfield edit-datetime">' . $element[0]['#item']['value'] . '</span>';
+function theme_jeditable_formatter_jeditable_checkbox_radio($variables) {
+  $element     = $variables['element'];
+  $field       = $variables['field'];
+  $entity      = $variables['entity'];
+  $entity_type = $variables['entity_type'];
+  $delta       = $variables['delta'];
+  $widget_type = $variables['widget_type'];
+  // krumo($variables); 
+  // echo drupal_render($field);
+  //die;
+  switch ($entity_type) {
+    case 'node':
+      // Check user's access to editing this node.
+      if (!node_access('update', $entity)) {
+        return $element['value'];
+      }
+
+      $id = $entity->nid;
+      break;
+
+    case 'user':
+      // Check user's access to editing this user.
+      if (!user_edit_access($entity)) {
+        return $element['value'];
+      }
+      $id = $entity->uid;
+      break;
+  }
+  if($entity_type == 'node') $entity_type='field';
+
+  // add check on checkbox or radio
+
+  /**
+  * needs custom ...
+  * limit  = 1     -> radio
+  * limit >= 1     -> checkbox
+  * also see ajaxcall class.. adjust
+  */
+  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $variables['delta'] . '" class="jeditable jeditable-' . $widget_type . '">' . $element['value'] . '</span>';
 }
 
 /**
- * Theme a boolean_list field as a jeditable checkbox.
+ * Theme a list field as a jeditable select.
  *
  * @ingroup themeable
  */
-function theme_jeditable_formatter_jeditable_checkbox($variables) {
+function theme_jeditable_formatter_jeditable_select($variables) {
   $element     = $variables['element'];
   $field       = $variables['field'];
+  $field_name  = $field['field_name'];
   $entity      = $variables['entity'];
   $entity_type = $variables['entity_type'];
-krumo($variables); 
-// echo drupal_render($field);
-die;
+  $widget_type = $variables['widget_type']; 
+  $delta       = $variables['delta'];
+  $field_info  = field_info_field($field_name);
+  //key value instead of key as value
+  $key_val     = isset($field_info['settings']['allowed_values'][$element['value']]) ? $field_info['settings']['allowed_values'][$element['value']] : t('- None -');
+
   switch ($entity_type) {
     case 'node':
       // Check user's access to editing this node.
       if (!node_access('update', $entity)) {
         return $element['value'];
       }
-
       $id = $entity->nid;
       break;
 
+    case 'field_collection_item':
+      // user's access inherited from node.
+      $field_name = $entity->field_name;
+      $hostEntity = entity_load_single('field_collection_item',$entity->item_id)->hostEntity();
+      $id = $hostEntity->nid;
+      // override delta with field_collection's delta
+      foreach ($hostEntity->{$field_name}[$hostEntity->language] as $key => $val) {
+        if ($val['value'] == $entity->item_id) {
+          $delta = $key;
+        }
+      }
+      break;
+
     case 'user':
       // Check user's access to editing this user.
       if (!user_edit_access($entity)) {
@@ -298,9 +429,43 @@ die;
       $id = $entity->uid;
       break;
   }
-  if($entity_type == 'node') $entity_type='field';
+  // if($entity_type == 'node') $entity_type='field';
+  if(strpos($field['field_name'],'field_')===0) $entity_type='field';
+
+  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $delta . '" class="jeditable jeditable-' . $widget_type . '">' . $key_val . '</span>';
+}
+
+
+/**
+ * Theme a CCK text field as a jeditable datepicker.
+ *
+ * @ingroup themeable
+ */
+function theme_jeditable_formatter_jeditable_datetime($variables) {
+  $element     = $variables['element'];
+  $field       = $variables['field'];
+  $entity      = $variables['entity'];
+  $entity_type = $variables['entity_type'];
+  $widget_type = $variables['widget_type']; 
+  $delta       = $variables['delta'];
+
+  // $id = $element['#node']->nid;
+  // $field = $element['#field_name'];
+
+  if ($entity_type == 'node') {
+    if (!node_access('update', $entity)) {
+      return $element['value'];
+      // make this formatted
+    }
+         $id = $entity->nid;
+  }
+
+  if(strpos($field['field_name'],'field_')===0) $entity_type='field';
+
+// original
+  // return '<span id="field-' . $id . '-' . $field['field_name'] . '" class="jeditable jeditable-datetime">' . $element[0]['#item']['value'] . '</span>';
+  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $variables['delta'] . '" class="jeditable jeditable-'. $widget_type . '">' . $element['value'] . '</span>';
 
-  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-checkbox-' . $variables['delta'] . '" class="jeditable jeditable-textfield">' . $element['value'] . '</span>';
 }
 
 /**
@@ -308,11 +473,15 @@ die;
  *
  * @ingroup themeable
  */
-function theme_jeditable_formatter_jeditable_select($variables) {
+function theme_jeditable_formatter_jeditable_upload($variables) {
+
   $element     = $variables['element'];
   $field       = $variables['field'];
   $entity      = $variables['entity'];
   $entity_type = $variables['entity_type'];
+  $widget_type = $variables['widget_type'];
+  $delta       = $variables['delta'];
+
 // krumo($variables); 
 // echo drupal_render($field);
 // die;
@@ -322,10 +491,16 @@ function theme_jeditable_formatter_jeditable_select($variables) {
       if (!node_access('update', $entity)) {
         return $element['value'];
       }
-
       $id = $entity->nid;
       break;
 
+    case 'field_collection_item':
+      // node_access handled by its node.
+      $id = entity_load_single('field_collection_item',$entity->item_id)->hostEntity()->nid;
+
+      break;
+
+
     case 'user':
       // Check user's access to editing this user.
       if (!user_edit_access($entity)) {
@@ -334,11 +509,24 @@ function theme_jeditable_formatter_jeditable_select($variables) {
       $id = $entity->uid;
       break;
   }
-  if($entity_type == 'node') $entity_type='field_checkbox';
+  // if($entity_type == 'node') $entity_type='field';
+  if(strpos($field['field_name'],'field_')===0) $entity_type='field';
+
+  // return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $variables['delta'] . '" class="jeditable jeditable-upload">' . (isset($element['filename'])?$element['filename']:$element['value']) . '</span>';
+
+  return theme('image', array(
+    'path' => $element['uri'], 
+    'alt' => $element['alt'],
+    'title' => $element['title'],
+    'width' => $element['width'],
+    'height' => $element['height'],
+    'attributes' => array('class' => 'jeditable jeditable-' . $widget_type, 'id' => $entity_type . '-' . $id . '-' . $field['field_name'] . '-' . $widget_type . '-' . $variables['delta']),
+    )
+  );
 
-  return '<span id="' . $entity_type . '-' . $id . '-' . $field['field_name'] . '- ' . $variables['delta'] . '" class="jeditable jeditable-textfield">' . $element['value'] . '</span>';
 }
 
+
 /**
  * Theme a workflow state name as a jeditable select list.
  *
@@ -346,6 +534,7 @@ function theme_jeditable_formatter_jeditable_select($variables) {
  *   The node object to be displayed
  * 
  * @ingroup themeable
+ * @return string
  */
 function theme_jeditable_workflow($node) {
   $id = $node->nid;
@@ -363,8 +552,11 @@ function theme_jeditable_workflow($node) {
 function _jeditable_ajax_save() {
   // Retrieve the values needed from the post to this page
   $array = explode('-', $_POST['id']);
+
+  // Assign variables as if they were an array
   list($type, $id, $field_name, $field_type, $delta) = $array;
   $value = check_plain($_POST['value']);
+
 //   drupal_set_message("type $type field $field_name value $value id $id delta $delta");
   switch($type) {
     case 'node':
@@ -373,7 +565,12 @@ function _jeditable_ajax_save() {
         $value = 'access denied'; // this is the value that will be returned, but no updates made
       } else {
 //         drupal_set_message(var_export($node->{$field_name},true));
-        $node->{$field_name} = $value;
+        if ($field_name == 'body') {
+          $node->body['und'][0]['value'] = $value;
+        }
+        else {
+          $node->{$field_name} = $value;
+        }
         $node->revision = variable_get('jeditable_create_new_revisions', false);
         node_save($node);
       }
@@ -398,6 +595,8 @@ function _jeditable_ajax_save() {
         $value = 'access denied'; // this is the value that will be returned, but no updates made
       } else {
         $field=field_info_field($field_name);
+        // get select, radio & checkbox key values
+        $key_value = $field['settings']['allowed_values'][$value];
         $lang=$field['translatable']?$node->language:LANGUAGE_NONE;
         // assign nid if nodereference, format date if date, otherwise just assign value
         if($field['type'] == 'nodereference') {
@@ -409,10 +608,27 @@ function _jeditable_ajax_save() {
           $value = date('o-m-d H:i:s', $unixtime);
           $node->{$field_name}[$lang][$delta]['value'] = $value;
         } else {
-          $node->{$field_name}[$lang][$delta]['value'] = $value;
+
+          //if type = node
+          if (isset($field['bundles']['node'])) {
+            $node->{$field_name}[$lang][$delta]['value'] = $value;
+          }
+
+          //if type = field_collection
+          if (isset($field['bundles']['field_collection_item'])) {
+            // get field_collection
+            $field_collection_name  = $field['bundles']['field_collection_item'][0];
+            $field_collection_id    = $node->{$field_collection_name}[$lang][$delta]['value'];
+            $field_collection       = entity_load_single('field_collection_item', array($field_collection_id));
+            $field_collection->{$field_name}[$lang][0]['value'] = $value;
+          }
+
         }
         $node->revision = variable_get('jeditable_create_new_revisions', false);
         node_save($node);
+        if (isset($field_collection)){
+          $field_collection->save();
+        }
       }
       break;
 
@@ -421,6 +637,11 @@ function _jeditable_ajax_save() {
       $value = _jeditable_workflow_save($node, $value);
       break;
   }
+
+  if ($field['type'] == 'list_text' || $field['type'] == 'list_boolean') {
+    $value = $key_value;
+  }
+
   print $value;
   exit();
 }
@@ -431,11 +652,16 @@ function _jeditable_ajax_save() {
 function _jeditable_ajax_load() {
   // Retrieve the values needed from the post to this page
   $array = explode('-', $_GET['id']);
-  list($type, $id, $field_name) = $array;
-  
+
+  // Assign variables as if they were an array
+  list($type, $id, $field_name, $field_type) = $array;
+
   switch($type) {
+
     case 'node':
+
       /** Not Implemented yet. This is a test case scenario for editing things such as a Node title **/
+
       $node = node_load($id);
       $value = $node->{$field};
       
@@ -447,6 +673,7 @@ function _jeditable_ajax_load() {
       );
       $defaults['selected'] = $value;
       break;
+
     case 'cck':
       /** Right now this supports nodereference only. The same handler should support optionwidget cck types
        *   in a dropdown, but that needs to be sorted out still.
@@ -464,12 +691,41 @@ function _jeditable_ajax_load() {
       }
       $defaults['selected'] = $current_value;
       break;
+
+    case 'field':
+      $node = node_load($id);
+
+      if(!node_access('update', $node)) { // check to see that current user has update permissions on the node
+        $value = 'access denied'; // this is the value that will be returned, but no updates made
+      } else {
+
+        $field = field_info_field($field_name);
+        $field_info = field_info_instance($entity_type = 'node' , $field_name, $node->type);
+
+        switch ($field_type) {
+          // jEditable select
+          case 'select':
+            //select load values works for both nodes & field_collections
+            $defaults = $field['settings']['allowed_values'];
+            $defaults = ($field_info['required'] != 1 ? array( '_none'  => t('- None -')) + $defaults : $defaults);
+            break;
+          // jEditable radio
+          case 'radio':
+            break;
+
+          case 'datetime':
+            break;
+        }
+      }
+      break;
+
     case 'workflow':
       /** Load the workflow states available to the current user **/
       $node = node_load($id);
       $defaults = _jeditable_workflow_load($node, $field_name);
   }
   print json_encode($defaults);
+
   exit();
 }
 
@@ -526,4 +782,4 @@ function _jeditable_workflow_save($node, $sid) {
   
   // finally, this is the intended outcome and we can return the changed state's name
   return workflow_get_state_name($new_sid);
-}
+}
\ No newline at end of file
